Skip to content

Use interpolated strings 5b #18996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iSazonov merged 3 commits into from
Jan 21, 2023
Merged

Use interpolated strings 5b #18996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2f7399
11 files
CarloToso Jan 20, 2023
3554e60
fix errors
CarloToso Jan 21, 2023
f168ee4
cleanup
CarloToso Jan 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/System.Management.Automation/engine/debugger/debugger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions src/System.Management.Automation/engine/hostifaces/HostUtilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions src/System.Management.Automation/engine/hostifaces/InternalHostUserInterface.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
10 changes: 5 additions & 5 deletions src/System.Management.Automation/engine/hostifaces/MshHostRawUserInterface.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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)"/>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/hostifaces/PSTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
{
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/interpreter/BranchLabel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})");
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/System.Management.Automation/engine/interpreter/LabelInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"));
}
}

Expand Down Expand Up @@ -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
Expand Down
10 changes: 3 additions & 7 deletions src/System.Management.Automation/engine/interpreter/LightCompiler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}]");
}
}

Expand Down Expand Up @@ -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}'");
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/interpreter/LocalVariables.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)}");
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/interpreter/StackOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down