Skip to content

Use interpolated strings 12 #19003

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 7 commits into from
Jan 23, 2023
Merged

Use interpolated strings 12 #19003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1be0d9d
3 files
CarloToso Jan 21, 2023
0089c2a
revert
CarloToso Jan 21, 2023
8be40c2
streamWriter.NewLine -> ToString
CarloToso Jan 21, 2023
c9ba906
streamWriter.NewLine.ToString()
CarloToso Jan 22, 2023
f3a9545
string.Format({streamWriter.NewLine})
CarloToso Jan 22, 2023
93bfa82
revert 2 files
CarloToso Jan 22, 2023
044d1c2
revert
CarloToso Jan 23, 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
6 changes: 2 additions & 4 deletions src/System.Management.Automation/engine/Modules/NewModuleManifestCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,14 +886,12 @@ private List<string> TryResolveFilePath(string filePath)
/// <returns></returns>
private string ManifestFragment(string key, string resourceString, string value, StreamWriter streamWriter)
{
return string.Format(CultureInfo.InvariantCulture, "{0}# {1}{2}{0}{3:19} = {4}{2}{2}",
_indent, resourceString, streamWriter.NewLine, key, value);
return string.Format(CultureInfo.InvariantCulture, "{0}# {1}{2}{0}{3:19} = {4}{2}{2}", _indent, resourceString, streamWriter.NewLine, key, value);
}

private string ManifestFragmentForNonSpecifiedManifestMember(string key, string resourceString, string value, StreamWriter streamWriter)
{
return string.Format(CultureInfo.InvariantCulture, "{0}# {1}{2}{0}# {3:19} = {4}{2}{2}",
_indent, resourceString, streamWriter.NewLine, key, value);
return string.Format(CultureInfo.InvariantCulture, "{0}# {1}{2}{0}# {3:19} = {4}{2}{2}", _indent, resourceString, streamWriter.NewLine, key, value);
}

private static string ManifestComment(string insert, StreamWriter streamWriter)
Expand Down
5 changes: 4 additions & 1 deletion src/System.Management.Automation/engine/remoting/commands/NewPSSessionConfigurationFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1868,7 +1868,7 @@ internal static string ConfigFragment(string key, string resourceString, string
{
return string.Format(CultureInfo.InvariantCulture, "# {0}{1}# {2:19} = {3}{4}{5}", resourceString, nl, key, value, nl, nl);
}

return string.Format(CultureInfo.InvariantCulture, "# {0}{1}{2:19} = {3}{4}{5}", resourceString, nl, key, value, nl, nl);
}

Expand All @@ -1880,7 +1880,10 @@ internal static string ConfigFragment(string key, string resourceString, string
internal static string QuoteName(object name)
{
if (name == null)
{
return "''";
}

return "'" + System.Management.Automation.Language.CodeGeneration.EscapeSingleQuotedStringContent(name.ToString()) + "'";
}

Expand Down
11 changes: 2 additions & 9 deletions src/System.Management.Automation/engine/runtime/Binding/Binders.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3959,12 +3959,7 @@ private PSGetIndexBinder(Tuple<CallInfo, PSMethodInvocationConstraints, bool> tu

public override string ToString()
{
return string.Format(CultureInfo.InvariantCulture,
"PSGetIndexBinder indexCount={0}{1}{2} ver:{3}",
this.CallInfo.ArgumentCount,
_allowSlicing ? string.Empty : " slicing disallowed",
_constraints == null ? string.Empty : " constraints: " + _constraints,
_version);
return string.Create(CultureInfo.InvariantCulture, $"PSGetIndexBinder indexCount={this.CallInfo.ArgumentCount}{(_allowSlicing ? string.Empty : " slicing disallowed")}{(_constraints == null ? string.Empty : " constraints: " + _constraints)} ver:{_version}");
Copy link
Member

@daxian-dbw daxian-dbw Jan 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@iSazonov I think this is way less readable than the original code, don't you think so?

Copy link
Collaborator

@iSazonov iSazonov Jan 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think more about reducing allocations. My suggestions for improvement I outlined in your PR.

}

internal static void InvalidateCache()
Expand Down Expand Up @@ -6579,9 +6574,7 @@ private PSInvokeMemberBinder(string name,

public override string ToString()
{
return string.Format(CultureInfo.InvariantCulture,
"PSInvokeMember: {0}{1}{2} ver:{3} args:{4} constraints:<{5}>", _static ? "static " : string.Empty, _propertySetter ? "propset " : string.Empty,
Name, _getMemberBinder._version, CallInfo.ArgumentCount, _invocationConstraints != null ? _invocationConstraints.ToString() : string.Empty);
return string.Create(CultureInfo.InvariantCulture, $"PSInvokeMember: {(_static ? "static " : string.Empty)}{(_propertySetter ? "propset " : string.Empty)}{Name} ver:{_getMemberBinder._version} args:{CallInfo.ArgumentCount} constraints:<{(_invocationConstraints != null ? _invocationConstraints.ToString() : string.Empty)}>");
}

public override DynamicMetaObject FallbackInvokeMember(DynamicMetaObject target, DynamicMetaObject[] args, DynamicMetaObject errorSuggestion)
Expand Down