Skip to content

perf: remove ToFullString call in Compare #1722

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

Open
TimothyMakkison wants to merge 1 commit into
base: main
Choose a base branch
from
Open

perf: remove ToFullString call in Compare #1722

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 20 additions & 18 deletions Src/CSharpier.Core/CSharp/SyntaxPrinter/UsingDirectives.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ usings[0].Parent is NamespaceDeclarationSyntax namespaceDeclarationSyntax
return Doc.Concat(docs);
}

private static IEnumerable<List<UsingData>> GroupUsings(
private static IEnumerable<IEnumerable<UsingData>> GroupUsings(
List<UsingDirectiveSyntax> usings,
SyntaxTriviaList triviaOnFirstUsing,
PrintingContext context
Expand Down Expand Up @@ -198,9 +198,11 @@ PrintingContext context
{
Using = usingDirective,
LeadingTrivia = !openIf ? PrintLeadingTrivia(usingDirective) : Doc.Null,
Alias = usingDirective?.Alias?.ToFullString(),
Name = usingDirective?.Name?.ToFullString(),
};

if (usingDirective.GlobalKeyword.RawSyntaxKind() != SyntaxKind.None)
if (usingDirective!.GlobalKeyword.RawSyntaxKind() != SyntaxKind.None)
{
if (usingDirective.Alias is not null)
{
Expand Down Expand Up @@ -245,15 +247,15 @@ PrintingContext context
}
}

yield return globalSystemUsings.OrderBy(o => o.Using, Comparer).ToList();
yield return globalUsings.OrderBy(o => o.Using, Comparer).ToList();
yield return globalAliasUsings.OrderBy(o => o.Using, Comparer).ToList();
yield return systemUsings.OrderBy(o => o.Using, Comparer).ToList();
yield return aliasNameUsings.OrderBy(o => o.Using, Comparer).ToList();
yield return regularUsings.OrderBy(o => o.Using, Comparer).ToList();
yield return staticSystemUsings.OrderBy(o => o.Using, Comparer).ToList();
yield return staticUsings.OrderBy(o => o.Using, Comparer).ToList();
yield return aliasUsings.OrderBy(o => o.Using, Comparer).ToList();
yield return globalSystemUsings.OrderBy(o => o, Comparer);
yield return globalUsings.OrderBy(o => o, Comparer);
yield return globalAliasUsings.OrderBy(o => o, Comparer);
yield return systemUsings.OrderBy(o => o, Comparer);
yield return aliasNameUsings.OrderBy(o => o, Comparer);
yield return regularUsings.OrderBy(o => o, Comparer);
yield return staticSystemUsings.OrderBy(o => o, Comparer);
yield return staticUsings.OrderBy(o => o, Comparer);
yield return aliasUsings.OrderBy(o => o, Comparer);
// we need the directive groups at the end, the #endif directive
// will be attached to the first node after the usings making it very hard print it before any of these other groups
yield return directiveGroup;
Expand All @@ -274,6 +276,8 @@ private class UsingData
{
public Doc LeadingTrivia { get; init; } = Doc.Null;
public UsingDirectiveSyntax? Using { get; init; }
public string? Alias { get; init; }
public string? Name { get; init; }
}

private static bool IsSystemName(NameSyntax value)
Expand All @@ -286,9 +290,9 @@ private static bool IsSystemName(NameSyntax value)
return value is IdentifierNameSyntax { Identifier.Text: "System" };
}

private class DefaultOrder : IComparer<UsingDirectiveSyntax?>
private class DefaultOrder : IComparer<UsingData?>
{
public int Compare(UsingDirectiveSyntax? x, UsingDirectiveSyntax? y)
public int Compare(UsingData? x, UsingData? y)
{
if (x?.Name is null && y?.Name is not null)
{
Expand All @@ -303,17 +307,15 @@ public int Compare(UsingDirectiveSyntax? x, UsingDirectiveSyntax? y)
if (x?.Alias is not null && y?.Alias is not null)
{
return string.Compare(
x.Alias.ToFullString(),
y.Alias.ToFullString(),
x.Alias,
y.Alias,
#pragma warning disable CA1309
StringComparison.InvariantCultureIgnoreCase
#pragma warning restore CA1309
);
}

return string.Compare(
x?.Name?.ToFullString(),
y?.Name?.ToFullString(),
return string.Compare(x?.Name, y?.Name,
#pragma warning disable CA1309
StringComparison.InvariantCultureIgnoreCase
#pragma warning restore CA1309
Expand Down