Skip to content

perf: use overload for Any( SyntaxTriviaList to prevent allocations #1703

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
belav merged 2 commits into from
Dec 25, 2025
+16 −28
Merged

perf: use overload for Any( SyntaxTriviaList to prevent allocations #1703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f57a3cd
perf: use overload for `Any( SyntaxTriviaList` to prevent allocations
TimothyMakkison Oct 11, 2025
3102140
Merge branch 'main' into trivia_list_enumerator
belav Dec 25, 2025
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
1 change: 1 addition & 0 deletions Src/CSharpier.Core/CSharp/SyntaxPrinter/Modifiers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using CSharpier.Core.DocTypes;
using CSharpier.Core.Utilities;
using Microsoft.CodeAnalysis;

namespace CSharpier.Core.CSharp.SyntaxPrinter;
Expand Down
1 change: 1 addition & 0 deletions Src/CSharpier.Core/CSharp/SyntaxPrinter/RightHandSide.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using CSharpier.Core.DocTypes;
using CSharpier.Core.Utilities;
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Syntax;

Expand Down
2 changes: 1 addition & 1 deletion Src/CSharpier.Core/CSharp/SyntaxPrinter/SyntaxNodePrinters/Parameter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public static Doc Print(ParameterSyntax node, PrintingContext context)
if (
node.AttributeLists.Count < 2
&& (
Enumerable.Any(node.GetLeadingTrivia(), o => o.IsComment())
node.GetLeadingTrivia().Any(o => o.IsComment())
|| node.Parent is ParameterListSyntax { Parameters.Count: 0 }
)
)
Expand Down
5 changes: 2 additions & 3 deletions Src/CSharpier.Core/CSharp/SyntaxPrinter/SyntaxNodePrinters/RecursivePattern.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,8 @@ or BinaryPatternSyntax
result.Add(
Doc.Group(
node.Type != null
&& !Enumerable.Any(
node.PropertyPatternClause.OpenBraceToken.LeadingTrivia,
o => o.IsDirective || o.IsComment()
&& !node.PropertyPatternClause.OpenBraceToken.LeadingTrivia.Any(o =>
o.IsDirective || o.IsComment()
)
? Doc.Line
: Doc.Null,
Expand Down
35 changes: 11 additions & 24 deletions Src/CSharpier.Core/CSharp/SyntaxPrinter/Token.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ or SyntaxKind.InterpolatedRawStringEndToken
{
if (
context.State.TrailingComma is not null
&& Enumerable.FirstOrDefault(syntaxToken.TrailingTrivia, o => o.IsComment())
&& syntaxToken.TrailingTrivia.FirstOrDefault(o => o.IsComment())
== context.State.TrailingComma.TrailingComment
)
{
Expand Down Expand Up @@ -174,7 +174,8 @@ public static Doc PrintLeadingTrivia(SyntaxToken syntaxToken, PrintingContext co
skipLastHardline: isClosingBrace
);

var hasDirective = Enumerable.Any(syntaxToken.LeadingTrivia, o => o.IsDirective);
var leadingTrivia = syntaxToken.LeadingTrivia;
var hasDirective = leadingTrivia.Any(o => o.IsDirective);

if (hasDirective)
{
Expand All @@ -198,7 +199,7 @@ public static Doc PrintLeadingTrivia(SyntaxToken syntaxToken, PrintingContext co

Doc extraNewLines = Doc.Null;

if (hasDirective || Enumerable.Any(syntaxToken.LeadingTrivia, o => o.IsComment()))
if (hasDirective || leadingTrivia.Any(o => o.IsComment()))
{
extraNewLines = ExtraNewLines.Print(syntaxToken.LeadingTrivia);
}
Expand Down Expand Up @@ -351,12 +352,7 @@ void AddLeadingComment(CommentType commentType)

if (context.State.NextTriviaNeedsLine)
{
if (
Enumerable.Any(
leadingTrivia,
o => o.RawSyntaxKind() is SyntaxKind.IfDirectiveTrivia
)
)
if (leadingTrivia.Any(o => o.RawSyntaxKind() is SyntaxKind.IfDirectiveTrivia))
{
docs.Insert(0, Doc.HardLineSkipBreakIfFirstInGroup);
}
Expand Down Expand Up @@ -430,17 +426,11 @@ private static Doc PrintTrailingTrivia(in SyntaxTriviaList trailingTrivia)

public static bool HasComments(SyntaxToken syntaxToken)
{
return Enumerable.Any(
syntaxToken.LeadingTrivia,
o =>
o.RawSyntaxKind()
is not (SyntaxKind.WhitespaceTrivia or SyntaxKind.EndOfLineTrivia)
return syntaxToken.LeadingTrivia.Any(o =>
o.RawSyntaxKind() is not (SyntaxKind.WhitespaceTrivia or SyntaxKind.EndOfLineTrivia)
)
|| Enumerable.Any(
syntaxToken.TrailingTrivia,
o =>
o.RawSyntaxKind()
is not (SyntaxKind.WhitespaceTrivia or SyntaxKind.EndOfLineTrivia)
|| syntaxToken.TrailingTrivia.Any(o =>
o.RawSyntaxKind() is not (SyntaxKind.WhitespaceTrivia or SyntaxKind.EndOfLineTrivia)
);
}

Expand All @@ -463,11 +453,8 @@ public static bool HasLeadingCommentMatching(SyntaxNode node, Regex regex)

public static bool HasLeadingCommentMatching(SyntaxToken token, Regex regex)
{
return Enumerable.Any(
token.LeadingTrivia,
o =>
o.RawSyntaxKind() is SyntaxKind.SingleLineCommentTrivia
&& regex.IsMatch(o.ToString())
return token.LeadingTrivia.Any(o =>
o.RawSyntaxKind() is SyntaxKind.SingleLineCommentTrivia && regex.IsMatch(o.ToString())
);
}
}