Use verbatim strings consistently for qualified modules

andyleejordan · andyleejordan · commit c60d8d4165de · 2023-09-07T21:29:15.000Z
diff --git a/src/PowerShellEditorServices.Hosting/Commands/StartEditorServicesCommand.cs b/src/PowerShellEditorServices.Hosting/Commands/StartEditorServicesCommand.cs
@@ -301,7 +301,7 @@ private void RemovePSReadLineForStartup()
         {
             _logger.Log(PsesLogLevel.Verbose, "Removing PSReadLine");
             using SMA.PowerShell pwsh = SMA.PowerShell.Create(RunspaceMode.CurrentRunspace);
-            bool hasPSReadLine = pwsh.AddCommand(new CmdletInfo("Microsoft.PowerShell.Core\\Get-Module", typeof(GetModuleCommand)))
+            bool hasPSReadLine = pwsh.AddCommand(new CmdletInfo(@"Microsoft.PowerShell.Core\Get-Module", typeof(GetModuleCommand)))
                 .AddParameter("Name", "PSReadLine")
                 .Invoke()
                 .Count > 0;
@@ -310,7 +310,7 @@ private void RemovePSReadLineForStartup()
             {
                 pwsh.Commands.Clear();
 
-                pwsh.AddCommand(new CmdletInfo("Microsoft.PowerShell.Core\\Remove-Module", typeof(RemoveModuleCommand)))
+                pwsh.AddCommand(new CmdletInfo(@"Microsoft.PowerShell.Core\Remove-Module", typeof(RemoveModuleCommand)))
                     .AddParameter("Name", "PSReadLine")
                     .AddParameter("ErrorAction", "SilentlyContinue");
 
diff --git a/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/LaunchAndAttachHandler.cs b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/LaunchAndAttachHandler.cs
@@ -378,9 +378,9 @@ await _executionService.ExecutePSCommandAsync(
             if (request.RunspaceName != null)
             {
                 PSCommand getRunspaceIdCommand = new PSCommand()
-                    .AddCommand("Microsoft.PowerShell.Utility\\Get-Runspace")
+                    .AddCommand(@"Microsoft.PowerShell.Utility\Get-Runspace")
                         .AddParameter("Name", request.RunspaceName)
-                    .AddCommand("Microsoft.PowerShell.Utility\\Select-Object")
+                    .AddCommand(@"Microsoft.PowerShell.Utility\Select-Object")
                         .AddParameter("ExpandProperty", "Id");
 
                 try
diff --git a/src/PowerShellEditorServices/Services/PowerShell/Debugging/DscBreakpointCapability.cs b/src/PowerShellEditorServices/Services/PowerShell/Debugging/DscBreakpointCapability.cs
@@ -92,7 +92,7 @@ public static async Task<DscBreakpointCapability> GetDscCapabilityAsync(
             if (!isDscInstalled.HasValue)
             {
                 PSCommand psCommand = new PSCommand()
-                    .AddCommand("Microsoft.PowerShell.Core\\Import-Module")
+                    .AddCommand(@"Microsoft.PowerShell.Core\Import-Module")
                     .AddParameter("-Name", "PSDesiredStateConfiguration")
                     .AddParameter("PassThru")
                     .AddParameter("ErrorAction", ActionPreference.Ignore);
diff --git a/src/PowerShellEditorServices/Services/PowerShell/Handlers/GetCommandHandler.cs b/src/PowerShellEditorServices/Services/PowerShell/Handlers/GetCommandHandler.cs
@@ -42,9 +42,9 @@ public async Task<List<PSCommandMessage>> Handle(GetCommandParams request, Cance
             // Executes the following:
             // Get-Command -CommandType Function,Cmdlet,ExternalScript | Sort-Object -Property Name
             psCommand
-                .AddCommand("Microsoft.PowerShell.Core\\Get-Command")
+                .AddCommand(@"Microsoft.PowerShell.Core\Get-Command")
                     .AddParameter("CommandType", new[] { "Function", "Cmdlet", "ExternalScript" })
-                .AddCommand("Microsoft.PowerShell.Utility\\Sort-Object")
+                .AddCommand(@"Microsoft.PowerShell.Utility\Sort-Object")
                     .AddParameter("Property", "Name");
 
             IEnumerable<CommandInfo> result = await _executionService.ExecutePSCommandAsync<CommandInfo>(psCommand, cancellationToken).ConfigureAwait(false);
diff --git a/src/PowerShellEditorServices/Services/PowerShell/Handlers/PSHostProcessAndRunspaceHandlers.cs b/src/PowerShellEditorServices/Services/PowerShell/Handlers/PSHostProcessAndRunspaceHandlers.cs
@@ -74,11 +74,11 @@ public async Task<RunspaceResponse[]> Handle(GetRunspaceParams request, Cancella
                 rs.Open();
                 ps.Runspace = rs;
                 // Returns deserialized Runspaces. For simpler code, we use PSObject and rely on dynamic later.
-                runspaces = ps.AddCommand("Microsoft.PowerShell.Utility\\Get-Runspace").Invoke<PSObject>();
+                runspaces = ps.AddCommand(@"Microsoft.PowerShell.Utility\Get-Runspace").Invoke<PSObject>();
             }
             else
             {
-                PSCommand psCommand = new PSCommand().AddCommand("Microsoft.PowerShell.Utility\\Get-Runspace");
+                PSCommand psCommand = new PSCommand().AddCommand(@"Microsoft.PowerShell.Utility\Get-Runspace");
                 // returns (not deserialized) Runspaces. For simpler code, we use PSObject and rely on dynamic later.
                 runspaces = await _executionService.ExecutePSCommandAsync<PSObject>(psCommand, cancellationToken).ConfigureAwait(false);
             }
diff --git a/src/PowerShellEditorServices/Services/PowerShell/Utility/CommandHelpers.cs b/src/PowerShellEditorServices/Services/PowerShell/Utility/CommandHelpers.cs
@@ -237,7 +237,7 @@ public static async Task<AliasMap> GetAliasesAsync(
             // our PSRL on idle handler.
             IReadOnlyList<CommandInfo> aliases = await executionService.ExecutePSCommandAsync<CommandInfo>(
                 new PSCommand()
-                    .AddCommand("Microsoft.PowerShell.Core\\Get-Command")
+                    .AddCommand(@"Microsoft.PowerShell.Core\Get-Command")
                     .AddParameter("ListImported", true)
                     .AddParameter("CommandType", CommandTypes.Alias),
                 cancellationToken).ConfigureAwait(false);
diff --git a/src/PowerShellEditorServices/Services/PowerShell/Utility/PowerShellExtensions.cs b/src/PowerShellEditorServices/Services/PowerShell/Utility/PowerShellExtensions.cs
@@ -139,7 +139,7 @@ public static void SetCorrectExecutionPolicy(this PowerShell pwsh, ILogger logge
             // We want to get the list hierarchy of execution policies
             // Calling the cmdlet is the simplest way to do that
             IReadOnlyList<PSObject> policies = pwsh
-                .AddCommand("Microsoft.PowerShell.Security\\Get-ExecutionPolicy")
+                .AddCommand(@"Microsoft.PowerShell.Security\Get-ExecutionPolicy")
                     .AddParameter("-List")
                 .InvokeAndClear<PSObject>();
 
@@ -181,7 +181,7 @@ public static void SetCorrectExecutionPolicy(this PowerShell pwsh, ILogger logge
             logger.LogTrace("Setting execution policy to {Policy}", policyToSet);
             try
             {
-                pwsh.AddCommand("Microsoft.PowerShell.Security\\Set-ExecutionPolicy")
+                pwsh.AddCommand(@"Microsoft.PowerShell.Security\Set-ExecutionPolicy")
                     .AddParameter("Scope", ExecutionPolicyScope.Process)
                     .AddParameter("ExecutionPolicy", policyToSet)
                     .AddParameter("Force")
@@ -222,7 +222,7 @@ public static void LoadProfiles(this PowerShell pwsh, ProfilePathInfo profilePat
 
         public static void ImportModule(this PowerShell pwsh, string moduleNameOrPath)
         {
-            pwsh.AddCommand("Microsoft.PowerShell.Core\\Import-Module")
+            pwsh.AddCommand(@"Microsoft.PowerShell.Core\Import-Module")
                 .AddParameter("-Name", moduleNameOrPath)
                 .InvokeAndClear();
         }
diff --git a/src/PowerShellEditorServices/Services/Template/TemplateService.cs b/src/PowerShellEditorServices/Services/Template/TemplateService.cs
@@ -89,7 +89,7 @@ await _executionService.ExecutePSCommandAsync<PSObject>(
 
                     psCommand = new PSCommand();
                     psCommand
-                        .AddCommand("Microsoft.PowerShell.Core\\Import-Module")
+                        .AddCommand(@"Microsoft.PowerShell.Core\Import-Module")
                         .AddParameter("ModuleInfo", (PSModuleInfo)moduleObject[0].ImmediateBaseObject)
                         .AddParameter("PassThru")
                         .AddParameter("ErrorAction", ActionPreference.Ignore);
diff --git a/src/PowerShellEditorServices/Services/Workspace/RemoteFileManagerService.cs b/src/PowerShellEditorServices/Services/Workspace/RemoteFileManagerService.cs
@@ -316,7 +316,7 @@ public async Task<string> FetchRemoteFileAsync(
                         {
                             // Load the file contents from the remote machine and create the buffer
                             PSCommand command = new PSCommand()
-                                .AddCommand("Microsoft.PowerShell.Management\\Get-Content")
+                                .AddCommand(@"Microsoft.PowerShell.Management\Get-Content")
                                 .AddParameter("Path", remoteFilePath)
                                 .AddParameter("Raw");
 
diff --git a/test/PowerShellEditorServices.Test/Debugging/DebugServiceTests.cs b/test/PowerShellEditorServices.Test/Debugging/DebugServiceTests.cs
@@ -1140,7 +1140,7 @@ await debugService.SetCommandBreakpointsAsync(
             VariableDetailsBase var = Array.Find(variables, v => v.Name == "$file");
             VariableDetailsBase[] childVars = await debugService.GetVariables(var.Id, CancellationToken.None).ConfigureAwait(true);
             Assert.Contains(childVars, i => i.Name is "PSPath");
-            Assert.Contains(childVars, i => i.Name is "PSProvider" && i.ValueString is "Microsoft.PowerShell.Core\\FileSystem");
+            Assert.Contains(childVars, i => i.Name is "PSProvider" && i.ValueString is @"Microsoft.PowerShell.Core\FileSystem");
             Assert.Contains(childVars, i => i.Name is "Exists" && i.ValueString is "$true");
             Assert.Contains(childVars, i => i.Name is "LastAccessTime");
         }

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public static async Task<DscBreakpointCapability> GetDscCapabilityAsync(`
`92`	`92`	`if (!isDscInstalled.HasValue)`
`93`	`93`	`{`
`94`	`94`	`PSCommand psCommand = new PSCommand()`
`95`		`- .AddCommand("Microsoft.PowerShell.Core\\Import-Module")`
	`95`	`+ .AddCommand(@"Microsoft.PowerShell.Core\Import-Module")`
`96`	`96`	`.AddParameter("-Name", "PSDesiredStateConfiguration")`
`97`	`97`	`.AddParameter("PassThru")`
`98`	`98`	`.AddParameter("ErrorAction", ActionPreference.Ignore);`
Original file line number	Diff line number	Diff line change
`@@ -74,11 +74,11 @@ public async Task<RunspaceResponse[]> Handle(GetRunspaceParams request, Cancella`
`74`	`74`	`rs.Open();`
`75`	`75`	`ps.Runspace = rs;`
`76`	`76`	`// Returns deserialized Runspaces. For simpler code, we use PSObject and rely on dynamic later.`
`77`		`- runspaces = ps.AddCommand("Microsoft.PowerShell.Utility\\Get-Runspace").Invoke<PSObject>();`
	`77`	`+ runspaces = ps.AddCommand(@"Microsoft.PowerShell.Utility\Get-Runspace").Invoke<PSObject>();`
`78`	`78`	`}`
`79`	`79`	`else`
`80`	`80`	`{`
`81`		`- PSCommand psCommand = new PSCommand().AddCommand("Microsoft.PowerShell.Utility\\Get-Runspace");`
	`81`	`+ PSCommand psCommand = new PSCommand().AddCommand(@"Microsoft.PowerShell.Utility\Get-Runspace");`
`82`	`82`	`// returns (not deserialized) Runspaces. For simpler code, we use PSObject and rely on dynamic later.`
`83`	`83`	`runspaces = await _executionService.ExecutePSCommandAsync<PSObject>(psCommand, cancellationToken).ConfigureAwait(false);`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@ public async Task<string> FetchRemoteFileAsync(`
`316`	`316`	`{`
`317`	`317`	`// Load the file contents from the remote machine and create the buffer`
`318`	`318`	`PSCommand command = new PSCommand()`
`319`		`- .AddCommand("Microsoft.PowerShell.Management\\Get-Content")`
	`319`	`+ .AddCommand(@"Microsoft.PowerShell.Management\Get-Content")`
`320`	`320`	`.AddParameter("Path", remoteFilePath)`
`321`	`321`	`.AddParameter("Raw");`
`322`	`322`
Original file line number	Diff line number	Diff line change
`@@ -1140,7 +1140,7 @@ await debugService.SetCommandBreakpointsAsync(`
`1140`	`1140`	`VariableDetailsBase var = Array.Find(variables, v => v.Name == "$file");`
`1141`	`1141`	`VariableDetailsBase[] childVars = await debugService.GetVariables(var.Id, CancellationToken.None).ConfigureAwait(true);`
`1142`	`1142`	`Assert.Contains(childVars, i => i.Name is "PSPath");`
`1143`		`- Assert.Contains(childVars, i => i.Name is "PSProvider" && i.ValueString is "Microsoft.PowerShell.Core\\FileSystem");`
	`1143`	`+ Assert.Contains(childVars, i => i.Name is "PSProvider" && i.ValueString is @"Microsoft.PowerShell.Core\FileSystem");`
`1144`	`1144`	`Assert.Contains(childVars, i => i.Name is "Exists" && i.ValueString is "$true");`
`1145`	`1145`	`Assert.Contains(childVars, i => i.Name is "LastAccessTime");`
`1146`	`1146`	`}`