Add namespaceIdentifier to CompilationUnitWidget. Minor changes.

ChebanovDD · ChebanovDD · commit 607161d3cd60 · 2023-05-22T10:16:00.000+08:00
diff --git a/src/UnityUxmlGenerator.UnityPackage/Assets/Plugins/UnityUxmlGenerator/Runtime/UnityUxmlGenerator.dll b/src/UnityUxmlGenerator.UnityPackage/Assets/Plugins/UnityUxmlGenerator/Runtime/UnityUxmlGenerator.dll
diff --git a/src/UnityUxmlGenerator/UxmlGenerator.Attributes.cs b/src/UnityUxmlGenerator/UxmlGenerator.Attributes.cs
@@ -26,14 +26,13 @@ private static SourceText GenerateAttributeClass(string attributeClassIdentifier
         MemberDeclarationSyntax[]? members = null)
     {
         return CompilationUnitWidget(
-                members: NamespaceWidget(
-                    identifier: AssemblyName.Name,
-                    member: ClassWidget(
-                        identifier: attributeClassIdentifier,
-                        modifiers: new[] { SyntaxKind.InternalKeyword, SyntaxKind.SealedKeyword },
-                        baseType: SimpleBaseType(IdentifierName(AttributeBaseType)),
-                        members: members,
-                        addGeneratedCodeAttributes: true)),
+                namespaceIdentifier: AssemblyName.Name,
+                members: ClassWidget(
+                    identifier: attributeClassIdentifier,
+                    modifiers: new[] { SyntaxKind.InternalKeyword, SyntaxKind.SealedKeyword },
+                    baseType: SimpleBaseType(IdentifierName(AttributeBaseType)),
+                    members: members,
+                    addGeneratedCodeAttributes: true),
                 normalizeWhitespace: true)
             .GetText(Encoding.UTF8);
     }
@@ -49,7 +48,7 @@ private static MemberDeclarationSyntax[] GetUxmlAttributeMembers()
                     identifier: "defaultValue",
                     type: NullableType(PredefinedType(Token(SyntaxKind.ObjectKeyword))),
                     addDefaultKeyword: true),
-                body: ExpressionStatement(AssignmentWidget(
+                bodyStatements: ExpressionStatement(AssignmentWidget(
                     left: IdentifierName("DefaultValue"),
                     right: IdentifierName("defaultValue"))),
                 addGeneratedCodeAttributes: true
@@ -58,7 +57,7 @@ private static MemberDeclarationSyntax[] GetUxmlAttributeMembers()
                 identifier: "DefaultValue",
                 type: NullableType(PredefinedType(Token(SyntaxKind.ObjectKeyword))),
                 modifier: SyntaxKind.PublicKeyword,
-                accessor: SyntaxKind.GetAccessorDeclaration,
+                accessors: SyntaxKind.GetAccessorDeclaration,
                 addGeneratedCodeAttributes: true
             )
         };
diff --git a/src/UnityUxmlGenerator/UxmlGenerator.Factory.cs b/src/UnityUxmlGenerator/UxmlGenerator.Factory.cs
@@ -12,17 +12,16 @@ internal sealed partial class UxmlGenerator
     private static SourceText GenerateUxmlFactory(UxmlFactoryCapture capture)
     {
         return CompilationUnitWidget(
-                members: NamespaceWidget(
-                    identifier: capture.ClassNamespace,
+                namespaceIdentifier: capture.ClassNamespace,
+                members: ClassWidget(
+                    identifier: capture.ClassName,
+                    modifier: SyntaxKind.PartialKeyword,
                     member: ClassWidget(
-                        identifier: capture.ClassName,
-                        modifier: SyntaxKind.PartialKeyword,
-                        member: ClassWidget(
-                            identifier: "UxmlFactory",
-                            modifiers: new[] { SyntaxKind.PublicKeyword, SyntaxKind.NewKeyword },
-                            baseType: SimpleBaseType(IdentifierName(string.Format(FactoryBaseTypeIdentifier, capture.ClassName))),
-                            addGeneratedCodeAttributes: true
-                        ))),
+                        identifier: "UxmlFactory",
+                        modifiers: new[] { SyntaxKind.PublicKeyword, SyntaxKind.NewKeyword },
+                        baseType: SimpleBaseType(IdentifierName(string.Format(FactoryBaseTypeIdentifier, capture.ClassName))),
+                        addGeneratedCodeAttributes: true
+                    )),
                 normalizeWhitespace: true)
             .GetText(Encoding.UTF8);
     }
diff --git a/src/UnityUxmlGenerator/UxmlGenerator.Traits.cs b/src/UnityUxmlGenerator/UxmlGenerator.Traits.cs
@@ -18,18 +18,17 @@ internal sealed partial class UxmlGenerator
     private static SourceText GenerateUxmlTraits(GeneratorExecutionContext context, UxmlTraitsCapture capture)
     {
         return CompilationUnitWidget(
-                members: NamespaceWidget(
-                    identifier: capture.ClassNamespace,
+                namespaceIdentifier: capture.ClassNamespace,
+                members: ClassWidget(
+                    identifier: capture.ClassName,
+                    modifier: SyntaxKind.PartialKeyword,
                     member: ClassWidget(
-                        identifier: capture.ClassName,
-                        modifier: SyntaxKind.PartialKeyword,
-                        member: ClassWidget(
-                            identifier: "UxmlTraits",
-                            modifiers: new[] { SyntaxKind.PublicKeyword, SyntaxKind.NewKeyword },
-                            baseType: SimpleBaseType(IdentifierName($"{GetBaseClassName(context, capture)}.UxmlTraits")),
-                            members: GetTraitsClassMembers(context, capture),
-                            addGeneratedCodeAttributes: true
-                        ))),
+                        identifier: "UxmlTraits",
+                        modifiers: new[] { SyntaxKind.PublicKeyword, SyntaxKind.NewKeyword },
+                        baseType: SimpleBaseType(IdentifierName($"{GetBaseClassName(context, capture)}.UxmlTraits")),
+                        members: GetTraitsClassMembers(context, capture),
+                        addGeneratedCodeAttributes: true
+                    )),
                 normalizeWhitespace: true)
             .GetText(Encoding.UTF8);
     }
@@ -100,7 +99,7 @@ private static MemberDeclarationSyntax[] GetTraitsClassMembers(GeneratorExecutio
                     identifier: "context",
                     type: IdentifierName(string.Format(UnityUiElementsFullName, "CreationContext"))),
             },
-            body: initMethodBody.ToArray(),
+            bodyStatements: initMethodBody.ToArray(),
             addGeneratedCodeAttributes: true
         );
 
diff --git a/src/UnityUxmlGenerator/UxmlGenerator.Widgets.cs b/src/UnityUxmlGenerator/UxmlGenerator.Widgets.cs
@@ -7,13 +7,19 @@ namespace UnityUxmlGenerator;
 internal sealed partial class UxmlGenerator
 {
     private static CompilationUnitSyntax CompilationUnitWidget(
+        string? namespaceIdentifier = null,
         bool addGeneratedCodeLeadingTrivia = true,
         bool normalizeWhitespace = true,
         params MemberDeclarationSyntax[]? members)
     {
         var compilationUnit = CompilationUnit();
 
-        if (members is not null)
+        if (string.IsNullOrWhiteSpace(namespaceIdentifier) == false)
+        {
+            compilationUnit =
+                compilationUnit.AddMembers(NamespaceWidget(identifier: namespaceIdentifier!, members: members));
+        }
+        else if (members is not null)
         {
             compilationUnit = compilationUnit.AddMembers(members);
         }
@@ -90,7 +96,7 @@ private static ConstructorDeclarationSyntax ConstructorWidget(
         ParameterSyntax? parameter = null,
         ParameterSyntax[]? parameters = null,
         bool addGeneratedCodeAttributes = false,
-        params StatementSyntax[]? body)
+        params StatementSyntax[]? bodyStatements)
     {
         var constructorDeclaration = ConstructorDeclaration(Identifier(identifier));
 
@@ -104,9 +110,9 @@ private static ConstructorDeclarationSyntax ConstructorWidget(
             constructorDeclaration = constructorDeclaration.AddParameterListParameters(parameters);
         }
 
-        if (body is not null)
+        if (bodyStatements is not null)
         {
-            constructorDeclaration = constructorDeclaration.WithBody(Block(body));
+            constructorDeclaration = constructorDeclaration.WithBody(Block(bodyStatements));
         }
 
         return BaseWidgetDecoration(constructorDeclaration, modifier, modifiers, addGeneratedCodeAttributes);
@@ -137,14 +143,14 @@ private static PropertyDeclarationSyntax PropertyWidget(
         SyntaxKind? modifier = null,
         SyntaxKind[]? modifiers = null,
         bool addGeneratedCodeAttributes = false,
-        params SyntaxKind[]? accessor)
+        params SyntaxKind[]? accessors)
     {
         var propertyDeclaration = PropertyDeclaration(type, Identifier(identifier));
 
-        if (accessor is not null)
+        if (accessors is not null)
         {
             propertyDeclaration =
-                propertyDeclaration.AddAccessorListAccessors(accessor.Select(AccessorWidget).ToArray());
+                propertyDeclaration.AddAccessorListAccessors(accessors.Select(AccessorWidget).ToArray());
         }
 
         return BaseWidgetDecoration(propertyDeclaration, modifier, modifiers, addGeneratedCodeAttributes);
@@ -158,7 +164,7 @@ private static MethodDeclarationSyntax MethodWidget(
         ParameterSyntax? parameter = null,
         ParameterSyntax[]? parameters = null,
         bool addGeneratedCodeAttributes = false,
-        params StatementSyntax[]? body)
+        params StatementSyntax[]? bodyStatements)
     {
         var methodDeclaration = MethodDeclaration(type, Identifier(identifier));
 
@@ -172,9 +178,9 @@ private static MethodDeclarationSyntax MethodWidget(
             methodDeclaration = methodDeclaration.AddParameterListParameters(parameters);
         }
 
-        if (body is not null)
+        if (bodyStatements is not null)
         {
-            methodDeclaration = methodDeclaration.WithBody(Block(body));
+            methodDeclaration = methodDeclaration.WithBody(Block(bodyStatements));
         }
 
         return BaseWidgetDecoration(methodDeclaration, modifier, modifiers, addGeneratedCodeAttributes);

Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,19 @@ namespace UnityUxmlGenerator;`
`7`	`7`	`internal sealed partial class UxmlGenerator`
`8`	`8`	`{`
`9`	`9`	`private static CompilationUnitSyntax CompilationUnitWidget(`
	`10`	`+ string? namespaceIdentifier = null,`
`10`	`11`	`bool addGeneratedCodeLeadingTrivia = true,`
`11`	`12`	`bool normalizeWhitespace = true,`
`12`	`13`	`params MemberDeclarationSyntax[]? members)`
`13`	`14`	`{`
`14`	`15`	`var compilationUnit = CompilationUnit();`
`15`	`16`
`16`		`- if (members is not null)`
	`17`	`+ if (string.IsNullOrWhiteSpace(namespaceIdentifier) == false)`
	`18`	`+ {`
	`19`	`+ compilationUnit =`
	`20`	`+ compilationUnit.AddMembers(NamespaceWidget(identifier: namespaceIdentifier!, members: members));`
	`21`	`+ }`
	`22`	`+ else if (members is not null)`
`17`	`23`	`{`
`18`	`24`	`compilationUnit = compilationUnit.AddMembers(members);`
`19`	`25`	`}`
`@@ -90,7 +96,7 @@ private static ConstructorDeclarationSyntax ConstructorWidget(`
`90`	`96`	`ParameterSyntax? parameter = null,`
`91`	`97`	`ParameterSyntax[]? parameters = null,`
`92`	`98`	`bool addGeneratedCodeAttributes = false,`
`93`		`- params StatementSyntax[]? body)`
	`99`	`+ params StatementSyntax[]? bodyStatements)`
`94`	`100`	`{`
`95`	`101`	`var constructorDeclaration = ConstructorDeclaration(Identifier(identifier));`
`96`	`102`
`@@ -104,9 +110,9 @@ private static ConstructorDeclarationSyntax ConstructorWidget(`
`104`	`110`	`constructorDeclaration = constructorDeclaration.AddParameterListParameters(parameters);`
`105`	`111`	`}`
`106`	`112`
`107`		`- if (body is not null)`
	`113`	`+ if (bodyStatements is not null)`
`108`	`114`	`{`
`109`		`- constructorDeclaration = constructorDeclaration.WithBody(Block(body));`
	`115`	`+ constructorDeclaration = constructorDeclaration.WithBody(Block(bodyStatements));`
`110`	`116`	`}`
`111`	`117`
`112`	`118`	`return BaseWidgetDecoration(constructorDeclaration, modifier, modifiers, addGeneratedCodeAttributes);`
`@@ -137,14 +143,14 @@ private static PropertyDeclarationSyntax PropertyWidget(`
`137`	`143`	`SyntaxKind? modifier = null,`
`138`	`144`	`SyntaxKind[]? modifiers = null,`
`139`	`145`	`bool addGeneratedCodeAttributes = false,`
`140`		`- params SyntaxKind[]? accessor)`
	`146`	`+ params SyntaxKind[]? accessors)`
`141`	`147`	`{`
`142`	`148`	`var propertyDeclaration = PropertyDeclaration(type, Identifier(identifier));`
`143`	`149`
`144`		`- if (accessor is not null)`
	`150`	`+ if (accessors is not null)`
`145`	`151`	`{`
`146`	`152`	`propertyDeclaration =`
`147`		`- propertyDeclaration.AddAccessorListAccessors(accessor.Select(AccessorWidget).ToArray());`
	`153`	`+ propertyDeclaration.AddAccessorListAccessors(accessors.Select(AccessorWidget).ToArray());`
`148`	`154`	`}`
`149`	`155`
`150`	`156`	`return BaseWidgetDecoration(propertyDeclaration, modifier, modifiers, addGeneratedCodeAttributes);`
`@@ -158,7 +164,7 @@ private static MethodDeclarationSyntax MethodWidget(`
`158`	`164`	`ParameterSyntax? parameter = null,`
`159`	`165`	`ParameterSyntax[]? parameters = null,`
`160`	`166`	`bool addGeneratedCodeAttributes = false,`
`161`		`- params StatementSyntax[]? body)`
	`167`	`+ params StatementSyntax[]? bodyStatements)`
`162`	`168`	`{`
`163`	`169`	`var methodDeclaration = MethodDeclaration(type, Identifier(identifier));`
`164`	`170`
`@@ -172,9 +178,9 @@ private static MethodDeclarationSyntax MethodWidget(`
`172`	`178`	`methodDeclaration = methodDeclaration.AddParameterListParameters(parameters);`
`173`	`179`	`}`
`174`	`180`
`175`		`- if (body is not null)`
	`181`	`+ if (bodyStatements is not null)`
`176`	`182`	`{`
`177`		`- methodDeclaration = methodDeclaration.WithBody(Block(body));`
	`183`	`+ methodDeclaration = methodDeclaration.WithBody(Block(bodyStatements));`
`178`	`184`	`}`
`179`	`185`
`180`	`186`	`return BaseWidgetDecoration(methodDeclaration, modifier, modifiers, addGeneratedCodeAttributes);`