Optimize syntax receivers.

Author: ChebanovDD

UnityUxmlGenerator.sln.DotSettings

@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Uxml/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

src/UnityUxmlGenerator.UnityPackage/Assets/Plugins/UnityUxmlGenerator/Runtime/UnityUxmlGenerator.dll

@@ -4,9 +4,9 @@ namespace UnityUxmlGenerator.Captures;
 
 internal sealed class UxmlFactoryCapture : BaseCapture
 {
-    public UxmlFactoryCapture((ClassDeclarationSyntax Class, AttributeSyntax Attribute) data) : base(data.Class)
+    public UxmlFactoryCapture(ClassDeclarationSyntax @class, AttributeSyntax attribute) : base(@class)
     {
-        Attribute = data.Attribute;
+        Attribute = attribute;
     }
 
     public override string ClassTag => "UxmlFactory";

src/UnityUxmlGenerator/Captures/UxmlFactoryCapture.cs

@@ -5,38 +5,26 @@ namespace UnityUxmlGenerator.Extensions;
 
 internal static class SyntaxNodeExtensions
 {
-    public static bool IsMemberHasAttribute<TMember>(this SyntaxNode syntaxNode, string attributeName,
-        out (TMember Member, AttributeSyntax Attribute) result) where TMember : MemberDeclarationSyntax
+    public static bool IsAttributeWithName(this SyntaxNode syntaxNode, string attributeName,
+        out AttributeSyntax? attribute)
     {
-        if (syntaxNode is not TMember memberSyntax)
+        if (syntaxNode is not AttributeSyntax attributeSyntax)
         {
-            result = default;
+            attribute = default;
             return false;
         }
 
-        result.Member = memberSyntax;
+        attribute = attributeSyntax;
 
-        for (var i = 0; i < memberSyntax.AttributeLists.Count; i++)
+        switch (attributeSyntax.Name)
         {
-            var attributeList = memberSyntax.AttributeLists[i];
-            for (var j = 0; j < attributeList.Attributes.Count; j++)
-            {
-                var attributeSyntax = attributeList.Attributes[j];
-                switch (attributeSyntax.Name)
-                {
-                    case IdentifierNameSyntax identifierNameSyntax
-                        when identifierNameSyntax.Identifier.Text.Contains(attributeName):
-                    case QualifiedNameSyntax qualifiedNameSyntax
-                        when qualifiedNameSyntax.Right.Identifier.Text.Contains(attributeName):
-                    {
-                        result.Attribute = attributeSyntax;
-                        return true;
-                    }
-                }
-            }
+            case IdentifierNameSyntax identifierNameSyntax
+                when identifierNameSyntax.Identifier.Text.Contains(attributeName):
+            case QualifiedNameSyntax qualifiedNameSyntax
+                when qualifiedNameSyntax.Right.Identifier.Text.Contains(attributeName):
+                return true;
         }
 
-        result = default;
         return false;
     }
 

src/UnityUxmlGenerator/Extensions/SyntaxNodeExtensions.cs

@@ -15,19 +15,24 @@ internal sealed class UxmlFactoryReceiver : BaseReceiver
 
     public override void OnVisitSyntaxNode(SyntaxNode syntaxNode)
     {
-        if (syntaxNode.IsMemberHasAttribute<ClassDeclarationSyntax>(AttributeName,
-                out (ClassDeclarationSyntax Class, AttributeSyntax Attribute) result) == false)
+        if (syntaxNode.IsAttributeWithName(AttributeName, out var attribute) == false)
         {
             return;
         }
 
-        if (result.Class.InheritsFromAnyType())
+        var member = attribute!.GetParent<MemberDeclarationSyntax>();
+        if (member is not ClassDeclarationSyntax @class)
         {
-            _captures.Add(new UxmlFactoryCapture(result));
+            return;
+        }
+
+        if (@class.InheritsFromAnyType())
+        {
+            _captures.Add(new UxmlFactoryCapture(@class, attribute!));
         }
-        else if (result.Class is not null)
+        else
         {
-            RegisterDiagnostic(ClassHasNoBaseClassError, result.Class.GetLocation(), result.Class.Identifier.Text);
+            RegisterDiagnostic(ClassHasNoBaseClassError, @class.GetLocation(), @class.Identifier.Text);
         }
     }
 }

src/UnityUxmlGenerator/SyntaxReceivers/UxmlFactoryReceiver.cs

@@ -16,15 +16,18 @@ internal sealed class UxmlTraitsReceiver : BaseReceiver
 
     public override void OnVisitSyntaxNode(SyntaxNode syntaxNode)
     {
-        if (syntaxNode.IsMemberHasAttribute<PropertyDeclarationSyntax>(AttributeName,
-                out (PropertyDeclarationSyntax Property, AttributeSyntax Attribute) result) == false)
+        if (syntaxNode.IsAttributeWithName(AttributeName, out var attribute) == false)
         {
             return;
         }
 
-        var (property, attribute) = result;
+        var member = attribute!.GetParent<MemberDeclarationSyntax>();
+        if (member is not PropertyDeclarationSyntax property)
+        {
+            return;
+        }
 
-        if (attribute.ArgumentList is not null && attribute.ArgumentList.Arguments.Any())
+        if (attribute!.ArgumentList is not null && attribute.ArgumentList.Arguments.Any())
         {
             if (HasSameType(property, attribute.ArgumentList.Arguments.First()) == false)
             {
@@ -55,7 +58,7 @@ public override void OnVisitSyntaxNode(SyntaxNode syntaxNode)
             _captures.Add(uxmlTraits.ClassName, uxmlTraits);
         }
 
-        uxmlTraits.Properties.Add(result);
+        uxmlTraits.Properties.Add((property, attribute));
     }
 
     private static bool HasSameType(BasePropertyDeclarationSyntax property, AttributeArgumentSyntax attributeArgument)