Merged

Wrap script paths with single instead of double quotes #1940

Show file tree
Hide file tree
Changes from all commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Failed to load files.
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ public sealed class StartEditorServicesCommand : PSCmdlet

public StartEditorServicesCommand()
{
//Sets the distribution channel to "PSES" so starts can be distinguished in PS7+ telemetry
// Sets the distribution channel to "PSES" so starts can be distinguished in PS7+ telemetry
Environment.SetEnvironmentVariable("POWERSHELL_DISTRIBUTION_CHANNEL", "PSES");
_disposableResources = new List<IDisposable>();
_loggerUnsubscribers = new List<IDisposable>();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -112,7 +112,7 @@ internal async Task LaunchScriptAsync(string scriptToLaunch)
{
// For a saved file we just execute its path (after escaping it).
command = PSCommandHelpers.BuildDotSourceCommandWithArguments(
string.Concat('"', scriptToLaunch, '"'), _debugStateService?.Arguments);
string.Concat("'", scriptToLaunch, "'"), _debugStateService?.Arguments);
}
else // It's a URI to an untitled script, or a raw script.
{
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -190,7 +190,7 @@ public async Task UsesDotSourceOperatorAndQuotesAsync()
ConfigurationDoneResponse configDoneResponse = await PsesDebugAdapterClient.RequestConfigurationDone(new ConfigurationDoneArguments()).ConfigureAwait(true);
Assert.NotNull(configDoneResponse);
Assert.Collection(await GetLog().ConfigureAwait(true),
(i) => Assert.StartsWith(". \"", i));
(i) => Assert.StartsWith(". '", i));
}

[Fact]
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -583,11 +583,11 @@ public async Task RecordsF5CommandInPowerShellHistory()

// Check the PowerShell history
Assert.Single(historyResult);
Assert.Equal(". \"" + debugScriptFile.FilePath + "\"", historyResult[0]);
Assert.Equal(". '" + debugScriptFile.FilePath + "'", historyResult[0]);

// Check the stubbed PSReadLine history
Assert.Single(testReadLine.history);
Assert.Equal(". \"" + debugScriptFile.FilePath + "\"", testReadLine.history[0]);
Assert.Equal(". '" + debugScriptFile.FilePath + "'", testReadLine.history[0]);
}

[Fact]
Expand Down