Address comment

daxian-dbw · daxian-dbw · commit 8f26dea593b5 · 2022-10-04T12:00:27.000-07:00
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostRawUserInterface.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostRawUserInterface.cs
@@ -45,13 +45,12 @@ class ConsoleHostRawUserInterface : System.Management.Automation.Host.PSHostRawU
                 var principal = new WindowsPrincipal(identity);
                 if (principal.IsInRole(WindowsBuiltInRole.Administrator))
                 {
-                    // check using Regex if the window already has Administrator: prefix
-                    // (i.e. from the parent console process)
-                    string template = ConsoleHostRawUserInterfaceStrings.WindowTitleTemplate;
-                    string windowTitle = WindowTitle;
-                    if (!windowTitle.AsSpan().StartsWith(template.AsSpan(0, template.IndexOf('{'))))
+                    // Check if the window already has the "Administrator: " prefix (i.e. from the parent console process).
+                    ReadOnlySpan<char> prefix = ConsoleHostRawUserInterfaceStrings.WindowTitleElevatedPrefix;
+                    ReadOnlySpan<char> windowTitle = WindowTitle;
+                    if (!windowTitle.StartsWith(prefix))
                     {
-                        WindowTitle = StringUtil.Format(template, windowTitle);
+                        WindowTitle = string.Concat(prefix, windowTitle);
                     }
                 }
             });
diff --git a/src/Microsoft.PowerShell.ConsoleHost/resources/ConsoleHostRawUserInterfaceStrings.resx b/src/Microsoft.PowerShell.ConsoleHost/resources/ConsoleHostRawUserInterfaceStrings.resx
@@ -171,7 +171,7 @@
   <data name="WindowTitleTooLongErrorTemplate" xml:space="preserve">
     <value>Window title cannot be longer than {0} characters.</value>
   </data>
-  <data name="WindowTitleTemplate" xml:space="preserve">
-    <value>Administrator: {0}</value>
+  <data name="WindowTitleElevatedPrefix" xml:space="preserve">
+    <value>Administrator: </value>
   </data>
 </root>

Original file line number	Diff line number	Diff line change
`@@ -45,13 +45,12 @@ class ConsoleHostRawUserInterface : System.Management.Automation.Host.PSHostRawU`
`45`	`45`	`var principal = new WindowsPrincipal(identity);`
`46`	`46`	`if (principal.IsInRole(WindowsBuiltInRole.Administrator))`
`47`	`47`	`{`
`48`		`- // check using Regex if the window already has Administrator: prefix`
`49`		`- // (i.e. from the parent console process)`
`50`		`- string template = ConsoleHostRawUserInterfaceStrings.WindowTitleTemplate;`
`51`		`- string windowTitle = WindowTitle;`
`52`		`- if (!windowTitle.AsSpan().StartsWith(template.AsSpan(0, template.IndexOf('{'))))`
	`48`	`+ // Check if the window already has the "Administrator: " prefix (i.e. from the parent console process).`
	`49`	`+ ReadOnlySpan<char> prefix = ConsoleHostRawUserInterfaceStrings.WindowTitleElevatedPrefix;`
	`50`	`+ ReadOnlySpan<char> windowTitle = WindowTitle;`
	`51`	`+ if (!windowTitle.StartsWith(prefix))`
`53`	`52`	`{`
`54`		`- WindowTitle = StringUtil.Format(template, windowTitle);`
	`53`	`+ WindowTitle = string.Concat(prefix, windowTitle);`
`55`	`54`	`}`
`56`	`55`	`}`
`57`	`56`	`});`