C#: Reintroduce separate externs, usings, attributeLists on CompilationUnit/NamespaceDeclaration#7152
Merged
knutwannheden merged 2 commits intomainfrom Mar 26, 2026
Merged
C#: Reintroduce separate externs, usings, attributeLists on CompilationUnit/NamespaceDeclaration#7152knutwannheden merged 2 commits intomainfrom
externs, usings, attributeLists on CompilationUnit/NamespaceDeclaration#7152knutwannheden merged 2 commits intomainfrom
Conversation
…mpilationUnit and NamespaceDeclaration The C# language specification requires a strict ordering of top-level elements (extern aliases → using directives → global attributes → member declarations). Modeling these as separate fields makes it straightforward for recipes to add/remove elements without needing to find the correct insertion position within a flat members list. Also removes Statement interface from ExternAlias, UsingDirective, and AttributeList since they now live in dedicated typed lists. Removes unused Java-only AST types (DestructorDeclaration, NewClass, MethodDeclaration, ArrayType) that had no C# counterpart. Moves ExpressionStatement from J.cs to Cs.cs to match the Java-side Cs.ExpressionStatement type.
The convention-based resolver already handles Cs$ConstrainedTypeParameter → OpenRewrite.CSharp.ConstrainedTypeParameter correctly.
knutwannheden
changed the title
externs, usings, attributeLists on CompilationUnit/NamespaceDeclaration
4 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation
externs,usings, andattributeListsinto a singlememberslist onCompilationUnitandNamespaceDeclaration. However, the C# language specification requires a strict ordering of top-level elements (extern_alias* → using_directive* → global_attributes* → namespace_member*). Having separate fields makes it straightforward for recipes to add/remove elements without needing to find the correct insertion position within a flat members list.Summary
externs(List<JRightPadded<ExternAlias>>),usings(List<JRightPadded<UsingDirective>>), andattributeLists(List<AttributeList>) as separate fields onCompilationUnit(both Java and C# sides)externsandusingsas separate fields onNamespaceDeclarationStatementinterface fromExternAlias,UsingDirective, andAttributeList— they now live in dedicated typed lists and don't need to be statementsCs.DestructorDeclaration,Cs.NewClass,Cs.MethodDeclaration,Cs.ArrayType) that had no C# counterpart and were never created by the parserExpressionStatementfromJ.cstoCs.csto match the Java-sideCs.ExpressionStatementtypeNamespaceDeclarationwith aSemicolonmarker (instead ofPackage+ flattened members)Test plan
gw :rewrite-csharp:test)