Merge pull request #674 from hadashiA/ku/refine-generator

Optimization of the search for the target of SourceGenerator

VContainer.SourceGenerator.Roslyn3/SyntaxCollector.cs

@@ -1,38 +1,44 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
-namespace VContainer.SourceGenerator
+namespace VContainer.SourceGenerator;
+
+class SyntaxCollector : ISyntaxReceiver
 {
-    class SyntaxCollector : ISyntaxReceiver
-    {
-        public List<string> Log { get; } = new();
-        public List<WorkItem> WorkItems { get; } = new();
+    public List<string> Log { get; } = new();
+    public List<WorkItem> WorkItems { get; } = new();
 
-        public void OnVisitSyntaxNode(SyntaxNode syntaxNode)
+    public void OnVisitSyntaxNode(SyntaxNode syntaxNode)
+    {
+        if (syntaxNode.IsKind(SyntaxKind.ClassDeclaration))
         {
-            if (IsCandidateType(syntaxNode))
+            if (syntaxNode is ClassDeclarationSyntax classDeclarationSyntax)
             {
-                WorkItems.Add(new WorkItem((TypeDeclarationSyntax)syntaxNode));
+                if (!classDeclarationSyntax.Modifiers.Any(modifier => modifier.IsKind(SyntaxKind.AbstractKeyword) ||
+                                                                      modifier.IsKind(SyntaxKind.StaticKeyword)))
+                {
+                    WorkItems.Add(new WorkItem(classDeclarationSyntax));
+                }
             }
         }
-
-        static bool IsCandidateType(SyntaxNode syntax)
+        else if (syntaxNode.IsKind(SyntaxKind.InvocationExpression))
         {
-            if (syntax is not ClassDeclarationSyntax classDeclarationSyntax)
-            {
-                return false;
-            }
-
-            if (classDeclarationSyntax.Modifiers.Any(modifier => modifier.IsKind(SyntaxKind.AbstractKeyword) ||
-                                                                 modifier.IsKind(SyntaxKind.StaticKeyword)))
+            if (syntaxNode is InvocationExpressionSyntax
+                {
+                    Expression: MemberAccessExpressionSyntax
+                    {
+                        Expression: IdentifierNameSyntax
+                    } memberAccess
+                } invocationExpressionSyntax)
             {
-                return false;
+                if (memberAccess.Name.Identifier.Text.StartsWith("Register"))
+                {
+                    WorkItems.Add(new WorkItem(invocationExpressionSyntax));
+                }
             }
-            return true;
         }
     }
-}
+}

VContainer.SourceGenerator.Roslyn3/VContainer.SourceGenerator.Roslyn3.csproj

@@ -9,6 +9,7 @@
         <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
         <DevelopmentDependency>true</DevelopmentDependency>
         <IsRoslynComponent>true</IsRoslynComponent>
+        <DefineConstants>ROSLYN3</DefineConstants>
     </PropertyGroup>
 
     <ItemGroup>