Skip to content
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.

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

Modify SyntaxNodeExtensions.GetMembers to instead execute a given lambda over the collection. #74628

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -757,15 +757,29 @@ public static SyntaxTokenList GetModifiers(this SyntaxNode? member)
_ => null,
};

public static IEnumerable<MemberDeclarationSyntax> GetMembers(this SyntaxNode? node)
=> node switch
public static void ForEachMember<TArg>(this SyntaxNode? node, Action<MemberDeclarationSyntax, TArg> callback, TArg arg)
{
// Separated out to allow for struct-based enumeration.
switch (node)
{
CompilationUnitSyntax compilation => compilation.Members,
BaseNamespaceDeclarationSyntax @namespace => @namespace.Members,
TypeDeclarationSyntax type => type.Members,
EnumDeclarationSyntax @enum => @enum.Members,
_ => [],
};
case CompilationUnitSyntax compilation:
foreach (var member in compilation.Members)
callback(member, arg);
break;
case BaseNamespaceDeclarationSyntax @namespace:
foreach (var member in @namespace.Members)
callback(member, arg);
break;
case TypeDeclarationSyntax type:
foreach (var member in type.Members)
callback(member, arg);
break;
case EnumDeclarationSyntax @enum:
foreach (var member in @enum.Members)
callback(member, arg);
break;
}
}

public static bool IsInExpressionTree(
[NotNullWhen(true)] this SyntaxNode? node,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -913,24 +913,24 @@ private void AppendMembers(SyntaxNode? node, ArrayBuilder<SyntaxNode> list, bool
{
Debug.Assert(topLevel || methodLevel);

foreach (var member in node.GetMembers())
{
if (IsTopLevelNodeWithMembers(member))
node.ForEachMember(static (member, arg) =>
{
if (topLevel)
var (@this, list, topLevel, methodLevel) = arg;
if (@this.IsTopLevelNodeWithMembers(member))
{
if (topLevel)
{
list.Add(member);
}

@this.AppendMembers(member, list, topLevel, methodLevel);
}
else if (methodLevel && @this.IsMethodLevelMember(member))
{
list.Add(member);
}

AppendMembers(member, list, topLevel, methodLevel);
continue;
}

if (methodLevel && IsMethodLevelMember(member))
{
list.Add(member);
}
}
},
(this, list, topLevel, methodLevel));
}

public TextSpan GetMemberBodySpanForSpeculativeBinding(SyntaxNode node)
Expand Down
Loading