Use interpolated strings 5b (PowerShell#18996)

CarloToso · web-flow · commit ebed59772511 · 2023-01-21T17:59:18.000+05:00
diff --git a/src/System.Management.Automation/engine/debugger/debugger.cs b/src/System.Management.Automation/engine/debugger/debugger.cs
@@ -5302,9 +5302,9 @@ private void DisplayScript(PSHost host, IList<PSObject> output, InvocationInfo i
             {
                 WriteLine(
                     lineNumber == invocationInfo.ScriptLineNumber ?
-                    string.Format(CultureInfo.CurrentCulture, "{0,5}:* {1}", lineNumber, _lines[lineNumber - 1])
+                    string.Create(CultureInfo.CurrentCulture, $"{lineNumber,5}:* { _lines[lineNumber - 1]}")
                     :
-                    string.Format(CultureInfo.CurrentCulture, "{0,5}:  {1}", lineNumber, _lines[lineNumber - 1]),
+                    string.Create(CultureInfo.CurrentCulture, $"{lineNumber,5}:  { _lines[lineNumber - 1]}"),
                     host,
                     output);
 
diff --git a/src/System.Management.Automation/engine/hostifaces/HostUtilities.cs b/src/System.Management.Automation/engine/hostifaces/HostUtilities.cs
@@ -639,10 +639,10 @@ runspace.ConnectionInfo is VMConnectionInfo ||
                 !string.IsNullOrEmpty(sshConnectionInfo.UserName) &&
                 !System.Environment.UserName.Equals(sshConnectionInfo.UserName, StringComparison.Ordinal))
             {
-                return string.Format(CultureInfo.InvariantCulture, "[{0}@{1}]: {2}", sshConnectionInfo.UserName, sshConnectionInfo.ComputerName, basePrompt);
+                return string.Create(CultureInfo.InvariantCulture, $"[{sshConnectionInfo.UserName}@{sshConnectionInfo.ComputerName}]: {basePrompt}");
             }
 
-            return string.Format(CultureInfo.InvariantCulture, "[{0}]: {1}", runspace.ConnectionInfo.ComputerName, basePrompt);
+            return string.Create(CultureInfo.InvariantCulture, $"[{runspace.ConnectionInfo.ComputerName}]: {basePrompt}");
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/hostifaces/InternalHostUserInterface.cs b/src/System.Management.Automation/engine/hostifaces/InternalHostUserInterface.cs
@@ -935,8 +935,7 @@ private Collection<int> EmulatePromptForMultipleChoice(string caption,
 
                 if (defaultChoiceKeys.Count == 1)
                 {
-                    defaultPrompt = StringUtil.Format(InternalHostUserInterfaceStrings.DefaultChoice,
-                        defaultChoicesStr);
+                    defaultPrompt = StringUtil.Format(InternalHostUserInterfaceStrings.DefaultChoice, defaultChoicesStr);
                 }
                 else
                 {
diff --git a/src/System.Management.Automation/engine/hostifaces/MshHostRawUserInterface.cs b/src/System.Management.Automation/engine/hostifaces/MshHostRawUserInterface.cs
@@ -71,7 +71,7 @@ public override
         string
         ToString()
         {
-            return string.Format(CultureInfo.InvariantCulture, "{0},{1}", X, Y);
+            return string.Create(CultureInfo.InvariantCulture, $"{X},{Y}");
         }
 
         /// <summary>
@@ -257,7 +257,7 @@ public override
         string
         ToString()
         {
-            return string.Format(CultureInfo.InvariantCulture, "{0},{1}", Width, Height);
+            return string.Create(CultureInfo.InvariantCulture, $"{Width},{Height}");
         }
 
         /// <summary>
@@ -566,7 +566,7 @@ public override
         string
         ToString()
         {
-            return string.Format(CultureInfo.InvariantCulture, "{0},{1},{2},{3}", VirtualKeyCode, Character, ControlKeyState, KeyDown);
+            return string.Create(CultureInfo.InvariantCulture, $"{VirtualKeyCode},{Character},{ControlKeyState},{KeyDown}");
         }
         /// <summary>
         /// Overrides <see cref="System.Object.Equals(object)"/>
@@ -796,7 +796,7 @@ public override
         string
         ToString()
         {
-            return string.Format(CultureInfo.InvariantCulture, "{0},{1} ; {2},{3}", Left, Top, Right, Bottom);
+            return string.Create(CultureInfo.InvariantCulture, $"{Left},{Top} ; {Right},{Bottom}");
         }
 
         /// <summary>
@@ -1024,7 +1024,7 @@ public override
         string
         ToString()
         {
-            return string.Format(CultureInfo.InvariantCulture, "'{0}' {1} {2} {3}", Character, ForegroundColor, BackgroundColor, BufferCellType);
+            return string.Create(CultureInfo.InvariantCulture, $"'{Character}' {ForegroundColor} {BackgroundColor} {BufferCellType}");
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs b/src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs
@@ -1413,7 +1413,7 @@ internal static void BuildHotkeysAndPlainLabels(Collection<ChoiceDescription> ch
                 if (string.Equals(hotkeysAndPlainLabels[0, i], "?", StringComparison.Ordinal))
                 {
                     Exception e = PSTraceSource.NewArgumentException(
-                        string.Format(Globalization.CultureInfo.InvariantCulture, "choices[{0}].Label", i),
+                        string.Create(Globalization.CultureInfo.InvariantCulture, $"choices[{i}].Label"),
                         InternalHostUserInterfaceStrings.InvalidChoiceHotKeyError);
                     throw e;
                 }
diff --git a/src/System.Management.Automation/engine/hostifaces/PSTask.cs b/src/System.Management.Automation/engine/hostifaces/PSTask.cs
@@ -912,7 +912,7 @@ private void CheckForComplete()
 
         private Runspace GetRunspace(int taskId)
         {
-            var runspaceName = string.Format(CultureInfo.InvariantCulture, "{0}:{1}", PSTask.RunspaceName, taskId);
+            var runspaceName = string.Create(CultureInfo.InvariantCulture, $"{PSTask.RunspaceName}:{taskId}");
 
             if (_useRunspacePool && _runspacePool.TryDequeue(out Runspace runspace))
             {
diff --git a/src/System.Management.Automation/engine/interpreter/BranchLabel.cs b/src/System.Management.Automation/engine/interpreter/BranchLabel.cs
@@ -34,7 +34,7 @@ public RuntimeLabel(int index, int continuationStackDepth, int stackDepth)
 
         public override string ToString()
         {
-            return string.Format(CultureInfo.InvariantCulture, "->{0} C({1}) S({2})", Index, ContinuationStackDepth, StackDepth);
+            return string.Create(CultureInfo.InvariantCulture, $"->{Index} C({ContinuationStackDepth}) S({StackDepth})");
         }
     }
 
diff --git a/src/System.Management.Automation/engine/interpreter/LabelInfo.cs b/src/System.Management.Automation/engine/interpreter/LabelInfo.cs
@@ -80,7 +80,7 @@ internal void Define(LabelScopeInfo block)
             {
                 if (j.ContainsTarget(_node))
                 {
-                    throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture, "Label target already defined: {0}", _node.Name));
+                    throw new InvalidOperationException(string.Create(CultureInfo.InvariantCulture, $"Label target already defined: {_node.Name}"));
                 }
             }
 
@@ -132,7 +132,7 @@ private void ValidateJump(LabelScopeInfo reference)
 
             if (HasMultipleDefinitions)
             {
-                throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture, "Ambiguous jump {0}", _node.Name));
+                throw new InvalidOperationException(string.Create(CultureInfo.InvariantCulture, $"Ambiguous jump {_node.Name}"));
             }
 
             // We didn't find an outward jump. Look for a jump across blocks
diff --git a/src/System.Management.Automation/engine/interpreter/LightCompiler.cs b/src/System.Management.Automation/engine/interpreter/LightCompiler.cs
@@ -92,11 +92,7 @@ internal bool IsInsideFinallyBlock(int index)
 
         public override string ToString()
         {
-            return string.Format(CultureInfo.InvariantCulture, "{0} [{1}-{2}] [{3}->{4}]",
-                (IsFault ? "fault" : "catch(" + ExceptionType.Name + ")"),
-                StartIndex, EndIndex,
-                HandlerStartIndex, HandlerEndIndex
-            );
+            return string.Create(CultureInfo.InvariantCulture, $"{(IsFault ? "fault" : "catch(" + ExceptionType.Name + ")")} [{StartIndex}-{EndIndex}] [{HandlerStartIndex}->{HandlerEndIndex}]");
         }
     }
 
@@ -231,11 +227,11 @@ public override string ToString()
         {
             if (IsClear)
             {
-                return string.Format(CultureInfo.InvariantCulture, "{0}: clear", Index);
+                return string.Create(CultureInfo.InvariantCulture, $"{Index}: clear");
             }
             else
             {
-                return string.Format(CultureInfo.InvariantCulture, "{0}: [{1}-{2}] '{3}'", Index, StartLine, EndLine, FileName);
+                return string.Create(CultureInfo.InvariantCulture, $"{Index}: [{StartLine}-{EndLine}] '{FileName}'");
             }
         }
     }
diff --git a/src/System.Management.Automation/engine/interpreter/LocalVariables.cs b/src/System.Management.Automation/engine/interpreter/LocalVariables.cs
@@ -77,7 +77,7 @@ internal Expression LoadFromArray(Expression frameData, Expression closure)
 
         public override string ToString()
         {
-            return string.Format(CultureInfo.InvariantCulture, "{0}: {1} {2}", Index, IsBoxed ? "boxed" : null, InClosure ? "in closure" : null);
+            return string.Create(CultureInfo.InvariantCulture, $"{Index}: {(IsBoxed ? "boxed" : null)} {(InClosure ? "in closure" : null)}");
         }
     }
 
diff --git a/src/System.Management.Automation/engine/interpreter/StackOperations.cs b/src/System.Management.Automation/engine/interpreter/StackOperations.cs
@@ -60,7 +60,7 @@ public override int Run(InterpretedFrame frame)
 
         public override string ToDebugString(int instructionIndex, object cookie, Func<int, int> labelIndexer, IList<object> objects)
         {
-            return string.Format(CultureInfo.InvariantCulture, "LoadCached({0}: {1})", _index, objects[(int)_index]);
+            return string.Create(CultureInfo.InvariantCulture, $"LoadCached({_index}: {objects[(int)_index]})");
         }
 
         public override string ToString()

Original file line number	Diff line number	Diff line change
`@@ -5302,9 +5302,9 @@ private void DisplayScript(PSHost host, IList<PSObject> output, InvocationInfo i`
`5302`	`5302`	`{`
`5303`	`5303`	`WriteLine(`
`5304`	`5304`	`lineNumber == invocationInfo.ScriptLineNumber ?`
`5305`		`- string.Format(CultureInfo.CurrentCulture, "{0,5}:* {1}", lineNumber, _lines[lineNumber - 1])`
	`5305`	`+ string.Create(CultureInfo.CurrentCulture, $"{lineNumber,5}:* { _lines[lineNumber - 1]}")`
`5306`	`5306`	`:`
`5307`		`- string.Format(CultureInfo.CurrentCulture, "{0,5}: {1}", lineNumber, _lines[lineNumber - 1]),`
	`5307`	`+ string.Create(CultureInfo.CurrentCulture, $"{lineNumber,5}: { _lines[lineNumber - 1]}"),`
`5308`	`5308`	`host,`
`5309`	`5309`	`output);`
`5310`	`5310`
Original file line number	Diff line number	Diff line change
`@@ -639,10 +639,10 @@ runspace.ConnectionInfo is VMConnectionInfo \|\|`
`639`	`639`	`!string.IsNullOrEmpty(sshConnectionInfo.UserName) &&`
`640`	`640`	`!System.Environment.UserName.Equals(sshConnectionInfo.UserName, StringComparison.Ordinal))`
`641`	`641`	`{`
`642`		`- return string.Format(CultureInfo.InvariantCulture, "[{0}@{1}]: {2}", sshConnectionInfo.UserName, sshConnectionInfo.ComputerName, basePrompt);`
	`642`	`+ return string.Create(CultureInfo.InvariantCulture, $"[{sshConnectionInfo.UserName}@{sshConnectionInfo.ComputerName}]: {basePrompt}");`
`643`	`643`	`}`
`644`	`644`
`645`		`- return string.Format(CultureInfo.InvariantCulture, "[{0}]: {1}", runspace.ConnectionInfo.ComputerName, basePrompt);`
	`645`	`+ return string.Create(CultureInfo.InvariantCulture, $"[{runspace.ConnectionInfo.ComputerName}]: {basePrompt}");`
`646`	`646`	`}`
`647`	`647`
`648`	`648`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -935,8 +935,7 @@ private Collection<int> EmulatePromptForMultipleChoice(string caption,`
`935`	`935`
`936`	`936`	`if (defaultChoiceKeys.Count == 1)`
`937`	`937`	`{`
`938`		`- defaultPrompt = StringUtil.Format(InternalHostUserInterfaceStrings.DefaultChoice,`
`939`		`- defaultChoicesStr);`
	`938`	`+ defaultPrompt = StringUtil.Format(InternalHostUserInterfaceStrings.DefaultChoice, defaultChoicesStr);`
`940`	`939`	`}`
`941`	`940`	`else`
`942`	`941`	`{`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public override`
`71`	`71`	`string`
`72`	`72`	`ToString()`
`73`	`73`	`{`
`74`		`- return string.Format(CultureInfo.InvariantCulture, "{0},{1}", X, Y);`
	`74`	`+ return string.Create(CultureInfo.InvariantCulture, $"{X},{Y}");`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`/// <summary>`
`@@ -257,7 +257,7 @@ public override`
`257`	`257`	`string`
`258`	`258`	`ToString()`
`259`	`259`	`{`
`260`		`- return string.Format(CultureInfo.InvariantCulture, "{0},{1}", Width, Height);`
	`260`	`+ return string.Create(CultureInfo.InvariantCulture, $"{Width},{Height}");`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`/// <summary>`
`@@ -566,7 +566,7 @@ public override`
`566`	`566`	`string`
`567`	`567`	`ToString()`
`568`	`568`	`{`
`569`		`- return string.Format(CultureInfo.InvariantCulture, "{0},{1},{2},{3}", VirtualKeyCode, Character, ControlKeyState, KeyDown);`
	`569`	`+ return string.Create(CultureInfo.InvariantCulture, $"{VirtualKeyCode},{Character},{ControlKeyState},{KeyDown}");`
`570`	`570`	`}`
`571`	`571`	`/// <summary>`
`572`	`572`	`/// Overrides <see cref="System.Object.Equals(object)"/>`
`@@ -796,7 +796,7 @@ public override`
`796`	`796`	`string`
`797`	`797`	`ToString()`
`798`	`798`	`{`
`799`		`- return string.Format(CultureInfo.InvariantCulture, "{0},{1} ; {2},{3}", Left, Top, Right, Bottom);`
	`799`	`+ return string.Create(CultureInfo.InvariantCulture, $"{Left},{Top} ; {Right},{Bottom}");`
`800`	`800`	`}`
`801`	`801`
`802`	`802`	`/// <summary>`
`@@ -1024,7 +1024,7 @@ public override`
`1024`	`1024`	`string`
`1025`	`1025`	`ToString()`
`1026`	`1026`	`{`
`1027`		`- return string.Format(CultureInfo.InvariantCulture, "'{0}' {1} {2} {3}", Character, ForegroundColor, BackgroundColor, BufferCellType);`
	`1027`	`+ return string.Create(CultureInfo.InvariantCulture, $"'{Character}' {ForegroundColor} {BackgroundColor} {BufferCellType}");`
`1028`	`1028`	`}`
`1029`	`1029`
`1030`	`1030`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -1413,7 +1413,7 @@ internal static void BuildHotkeysAndPlainLabels(Collection<ChoiceDescription> ch`
`1413`	`1413`	`if (string.Equals(hotkeysAndPlainLabels[0, i], "?", StringComparison.Ordinal))`
`1414`	`1414`	`{`
`1415`	`1415`	`Exception e = PSTraceSource.NewArgumentException(`
`1416`		`- string.Format(Globalization.CultureInfo.InvariantCulture, "choices[{0}].Label", i),`
	`1416`	`+ string.Create(Globalization.CultureInfo.InvariantCulture, $"choices[{i}].Label"),`
`1417`	`1417`	`InternalHostUserInterfaceStrings.InvalidChoiceHotKeyError);`
`1418`	`1418`	`throw e;`
`1419`	`1419`	`}`
Original file line number	Diff line number	Diff line change
`@@ -912,7 +912,7 @@ private void CheckForComplete()`
`912`	`912`
`913`	`913`	`private Runspace GetRunspace(int taskId)`
`914`	`914`	`{`
`915`		`- var runspaceName = string.Format(CultureInfo.InvariantCulture, "{0}:{1}", PSTask.RunspaceName, taskId);`
	`915`	`+ var runspaceName = string.Create(CultureInfo.InvariantCulture, $"{PSTask.RunspaceName}:{taskId}");`
`916`	`916`
`917`	`917`	`if (_useRunspacePool && _runspacePool.TryDequeue(out Runspace runspace))`
`918`	`918`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public RuntimeLabel(int index, int continuationStackDepth, int stackDepth)`
`34`	`34`
`35`	`35`	`public override string ToString()`
`36`	`36`	`{`
`37`		`- return string.Format(CultureInfo.InvariantCulture, "->{0} C({1}) S({2})", Index, ContinuationStackDepth, StackDepth);`
	`37`	`+ return string.Create(CultureInfo.InvariantCulture, $"->{Index} C({ContinuationStackDepth}) S({StackDepth})");`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ internal void Define(LabelScopeInfo block)`
`80`	`80`	`{`
`81`	`81`	`if (j.ContainsTarget(_node))`
`82`	`82`	`{`
`83`		`- throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture, "Label target already defined: {0}", _node.Name));`
	`83`	`+ throw new InvalidOperationException(string.Create(CultureInfo.InvariantCulture, $"Label target already defined: {_node.Name}"));`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
`@@ -132,7 +132,7 @@ private void ValidateJump(LabelScopeInfo reference)`
`132`	`132`
`133`	`133`	`if (HasMultipleDefinitions)`
`134`	`134`	`{`
`135`		`- throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture, "Ambiguous jump {0}", _node.Name));`
	`135`	`+ throw new InvalidOperationException(string.Create(CultureInfo.InvariantCulture, $"Ambiguous jump {_node.Name}"));`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`// We didn't find an outward jump. Look for a jump across blocks`
Original file line number	Diff line number	Diff line change
`@@ -92,11 +92,7 @@ internal bool IsInsideFinallyBlock(int index)`
`92`	`92`
`93`	`93`	`public override string ToString()`
`94`	`94`	`{`
`95`		`- return string.Format(CultureInfo.InvariantCulture, "{0} [{1}-{2}] [{3}->{4}]",`
`96`		`- (IsFault ? "fault" : "catch(" + ExceptionType.Name + ")"),`
`97`		`- StartIndex, EndIndex,`
`98`		`- HandlerStartIndex, HandlerEndIndex`
`99`		`- );`
	`95`	`+ return string.Create(CultureInfo.InvariantCulture, $"{(IsFault ? "fault" : "catch(" + ExceptionType.Name + ")")} [{StartIndex}-{EndIndex}] [{HandlerStartIndex}->{HandlerEndIndex}]");`
`100`	`96`	`}`
`101`	`97`	`}`
`102`	`98`
`@@ -231,11 +227,11 @@ public override string ToString()`
`231`	`227`	`{`
`232`	`228`	`if (IsClear)`
`233`	`229`	`{`
`234`		`- return string.Format(CultureInfo.InvariantCulture, "{0}: clear", Index);`
	`230`	`+ return string.Create(CultureInfo.InvariantCulture, $"{Index}: clear");`
`235`	`231`	`}`
`236`	`232`	`else`
`237`	`233`	`{`
`238`		`- return string.Format(CultureInfo.InvariantCulture, "{0}: [{1}-{2}] '{3}'", Index, StartLine, EndLine, FileName);`
	`234`	`+ return string.Create(CultureInfo.InvariantCulture, $"{Index}: [{StartLine}-{EndLine}] '{FileName}'");`
`239`	`235`	`}`
`240`	`236`	`}`
`241`	`237`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ internal Expression LoadFromArray(Expression frameData, Expression closure)`
`77`	`77`
`78`	`78`	`public override string ToString()`
`79`	`79`	`{`
`80`		`- return string.Format(CultureInfo.InvariantCulture, "{0}: {1} {2}", Index, IsBoxed ? "boxed" : null, InClosure ? "in closure" : null);`
	`80`	`+ return string.Create(CultureInfo.InvariantCulture, $"{Index}: {(IsBoxed ? "boxed" : null)} {(InClosure ? "in closure" : null)}");`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`