Use ForAttributeWithMetadataName()

AutomaticInterface/AutomaticInterface/AutomaticInterface.csproj

@@ -25,11 +25,11 @@
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <EnableNETAnalyzers>True</EnableNETAnalyzers>
         <AnalysisLevel>latest-Recommended</AnalysisLevel>
-        <Version>3.0.0</Version>
-        <Version>2.5.0</Version>
+        <Version>3.0.1</Version>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <NoWarn>1701;1702;NU5128</NoWarn>
+        <PackageReleaseNotes>Use ForAttributeWithMetadataName to improve performance</PackageReleaseNotes>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugGenerator|AnyCPU'">
@@ -42,8 +42,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.2.0" PrivateAssets="all" />
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" PrivateAssets="all" />
     </ItemGroup>
 
     <ItemGroup>

AutomaticInterface/AutomaticInterface/AutomaticInterfaceGenerator.cs

@@ -1,10 +1,7 @@
 using System;
 using System.Collections.Immutable;
-using System.Text;
-using System.Threading;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Text;
 
 namespace AutomaticInterface;
 
@@ -16,68 +13,23 @@ public class AutomaticInterfaceGenerator : IIncrementalGenerator
 
     public void Initialize(IncrementalGeneratorInitializationContext context)
     {
-        context.RegisterPostInitializationOutput(static postInitializationContext =>
-        {
-            postInitializationContext.AddSource(
-                $"{DefaultAttributeName}.Attribute.g.cs",
-                SourceText.From(
-                    $$$"""
-                    // <auto-generated />
-                    using System;
-
-                    namespace AutomaticInterface
-                    {
-                        /// <summary>
-                        /// Use source generator to automatically create a Interface from this class
-                        /// </summary>
-                        [AttributeUsage(AttributeTargets.Class)]
-                        internal sealed class {{{DefaultAttributeName}}}Attribute : Attribute
-                        {
-                            internal {{{DefaultAttributeName}}}Attribute(string namespaceName = "") { }
-                        }
-                    }
-                    """,
-                    Encoding.UTF8
-                )
-            );
-        });
+        context.RegisterDefaultAttribute();
+        context.RegisterIgnoreAttribute();
 
         var classes = context
-            .SyntaxProvider.CreateSyntaxProvider(CouldBeClassWithInterfaceAttribute, Transform)
-            .Where(type => type is not null)
+            .SyntaxProvider.ForAttributeWithMetadataName(
+                $"AutomaticInterface.{DefaultAttributeName}Attribute",
+                (node, _) => node is ClassDeclarationSyntax,
+                (context, _) => (ITypeSymbol)context.TargetSymbol
+            )
             .Collect();
 
         context.RegisterSourceOutput(classes, GenerateCode);
     }
 
-    private static bool CouldBeClassWithInterfaceAttribute(
-        SyntaxNode syntaxNode,
-        CancellationToken _
-    )
-    {
-        if (syntaxNode is not AttributeSyntax attribute)
-        {
-            return false;
-        }
-
-        var name = ExtractName(attribute.Name);
-
-        return name is DefaultAttributeName;
-    }
-
-    private static string? ExtractName(NameSyntax? name)
-    {
-        return name switch
-        {
-            SimpleNameSyntax ins => ins.Identifier.Text,
-            QualifiedNameSyntax qns => qns.Right.Identifier.Text,
-            _ => null
-        };
-    }
-
     private static void GenerateCode(
         SourceProductionContext context,
-        ImmutableArray<ITypeSymbol?> enumerations
+        ImmutableArray<ITypeSymbol> enumerations
     )
     {
         if (enumerations.IsDefaultOrEmpty)
@@ -87,13 +39,8 @@ private static void GenerateCode(
 
         foreach (var type in enumerations)
         {
-            if (type is null)
-            {
-                continue;
-            }
-
             var typeNamespace = type.ContainingNamespace.IsGlobalNamespace
-                ? $"${Guid.NewGuid().ToString()}"
+                ? $"${Guid.NewGuid()}"
                 : $"{type.ContainingNamespace}";
 
             var code = Builder.BuildInterfaceFor(type);
@@ -102,23 +49,4 @@ private static void GenerateCode(
             context.AddSource(hintName, code);
         }
     }
-
-    private static ITypeSymbol? Transform(
-        GeneratorSyntaxContext context,
-        CancellationToken cancellationToken
-    )
-    {
-        var attributeSyntax = (AttributeSyntax)context.Node;
-        if (attributeSyntax.Parent?.Parent is not ClassDeclarationSyntax classDeclaration)
-        {
-            return null;
-        }
-
-        var type =
-            context.SemanticModel.GetDeclaredSymbol(
-                classDeclaration,
-                cancellationToken: cancellationToken
-            ) as ITypeSymbol;
-        return type;
-    }
 }

AutomaticInterface/AutomaticInterface/RegisterAttributesExtensions.cs

@@ -0,0 +1,72 @@
+using System.Text;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+
+namespace AutomaticInterface;
+
+internal static class RegisterAttributesExtensions
+{
+    public static IncrementalGeneratorInitializationContext RegisterDefaultAttribute(
+        this IncrementalGeneratorInitializationContext context
+    )
+    {
+        context.RegisterPostInitializationOutput(static postInitializationContext =>
+        {
+            postInitializationContext.AddSource(
+                $"{AutomaticInterfaceGenerator.DefaultAttributeName}.Attribute.g.cs",
+                SourceText.From(
+                    $$$"""
+                    // <auto-generated />
+                    using System;
+
+                    namespace AutomaticInterface
+                    {
+                        /// <summary>
+                        /// Use source generator to automatically create a Interface from this class
+                        /// </summary>
+                        [AttributeUsage(AttributeTargets.Class)]
+                        internal sealed class {{{AutomaticInterfaceGenerator.DefaultAttributeName}}}Attribute : Attribute
+                        {
+                            internal {{{AutomaticInterfaceGenerator.DefaultAttributeName}}}Attribute(string namespaceName = "") { }
+                        }
+                    }
+                    """,
+                    Encoding.UTF8
+                )
+            );
+        });
+        return context;
+    }
+
+    public static IncrementalGeneratorInitializationContext RegisterIgnoreAttribute(
+        this IncrementalGeneratorInitializationContext context
+    )
+    {
+        context.RegisterPostInitializationOutput(static postInitializationContext =>
+        {
+            postInitializationContext.AddSource(
+                $"{AutomaticInterfaceGenerator.IgnoreAutomaticInterfaceAttributeName}.Attribute.g.cs",
+                SourceText.From(
+                    $$$"""
+                    // <auto-generated />
+                    using System;
+
+                    namespace AutomaticInterface
+                    {
+                        /// <summary>
+                        /// Ignore this member in a generated Interface from this class
+                        /// </summary>
+                        [AttributeUsage(AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Event)]
+                        internal sealed class {{{AutomaticInterfaceGenerator.IgnoreAutomaticInterfaceAttributeName}}}Attribute : Attribute
+                        {
+                            internal {{{AutomaticInterfaceGenerator.IgnoreAutomaticInterfaceAttributeName}}}Attribute() { }
+                        }
+                    }
+                    """,
+                    Encoding.UTF8
+                )
+            );
+        });
+        return context;
+    }
+}

AutomaticInterface/AutomaticInterfaceExample/DemoClass.cs

@@ -18,9 +18,9 @@
         /// <summary>
         /// Property Documentation will be copied
         /// </summary>
         public string Hello { get; set; } // included, get and set are copied to the interface when public
 
         public string OnlyGet { get; } // included, get and set are copied to the interface when public
 
         public string? NullableProperty { get; set; }
 
@@ -46,9 +46,15 @@
             return "Ok";
         }
 
+        [IgnoreAutomaticInterface]
+        public string IgnoreMethod(string x, string y) // // ignored because of attribute
+        {
+            return BMethod(x, y);
+        }
+
         public Task<string?> ASync(string x, string y)
         {
             return Task.FromResult("");
         }
 
         public static string StaticProperty => "abc"; // static property, ignored
@@ -62,18 +68,18 @@
         /// event Documentation will be copied
         /// </summary>
 #pragma warning disable S3264 // Events should be invoked
         public event EventHandler ShapeChanged; // included
 #pragma warning restore S3264 // Events should be invoked
 
 #pragma warning disable S3264 // Events should be invoked
 #pragma warning disable IDE0051 // Remove unused private members
         private event EventHandler ShapeChanged2; // ignored because not public
 #pragma warning restore IDE0051 // Remove unused private members
 #pragma warning restore S3264 // Events should be invoked
 
         public event EventHandler? ShapeChangedNullable; // included
 
         public event EventHandler<string?> ShapeChangedNullable2; // included
 
         private readonly int[] arr = new int[100];
 

AutomaticInterface/Tests/GeneratorTests.cs

@@ -718,54 +718,7 @@ public void IgnoresMembersAttributedWithSkip()
     {
         const string code = """
 
-            using AutomaticInterfaceAttribute;
-            using System.IO;
-
-            namespace AutomaticInterfaceExample
-            {
-
-                [GenerateAutomaticInterface]
-                class DemoClass
-                {
-                    [IgnoreAutomaticInterface] public string Hello1(string x, int y, double z){return x;}
-                    [IgnoreAutomaticInterface] public string Hello2 { get; set; }
-                    [IgnoreAutomaticInterface] public event EventHandler Hello3;
-                }
-            }
-
-            """;
-
-        const string expected = """
-            //--------------------------------------------------------------------------------------------------
-            // <auto-generated>
-            //     This code was generated by a tool.
-            //
-            //     Changes to this file may cause incorrect behavior and will be lost if the code is regenerated.
-            // </auto-generated>
-            //--------------------------------------------------------------------------------------------------
-
-            using System.CodeDom.Compiler;
-            using AutomaticInterfaceAttribute;
-            using System.IO;
-
-            namespace AutomaticInterfaceExample
-            {
-                [GeneratedCode("AutomaticInterface", "")]
-                public partial interface IDemoClass
-                {
-                }
-            }
-
-            """;
-        GenerateCode(code).Should().Be(expected);
-    }
-
-    [Fact]
-    public void IgnoresMembersAttributedWithSkip()
-    {
-        const string code = """
-
-            using AutomaticInterfaceAttribute;
+            using AutomaticInterface;
             using System.IO;
 
             namespace AutomaticInterfaceExample
@@ -792,7 +745,7 @@ class DemoClass
             //--------------------------------------------------------------------------------------------------
 
             using System.CodeDom.Compiler;
-            using AutomaticInterfaceAttribute;
+            using AutomaticInterface;
             using System.IO;
 
             namespace AutomaticInterfaceExample
@@ -2305,7 +2258,7 @@ public void WorksWithMethodOverrides()
     {
         const string code = """
 
-            using AutomaticInterfaceAttribute;
+            using AutomaticInterface;
 
             namespace AutomaticInterfaceExample;
 
@@ -2332,7 +2285,7 @@ public class DemoClass : BaseClass
             //--------------------------------------------------------------------------------------------------
 
             using System.CodeDom.Compiler;
-            using AutomaticInterfaceAttribute;
+            using AutomaticInterface;
 
             namespace AutomaticInterfaceExample
             {
@@ -2354,7 +2307,7 @@ public void WorksWithMethodShadowing()
     {
         const string code = """
 
-            using AutomaticInterfaceAttribute;
+            using AutomaticInterface;
 
             namespace AutomaticInterfaceExample;
 
@@ -2381,7 +2334,7 @@ public class DemoClass : BaseClass
             //--------------------------------------------------------------------------------------------------
 
             using System.CodeDom.Compiler;
-            using AutomaticInterfaceAttribute;
+            using AutomaticInterface;
 
             namespace AutomaticInterfaceExample
             {
@@ -2403,7 +2356,7 @@ public void WorksWithParameterDirectionOverloads()
     {
         const string code = """
 
-            using AutomaticInterfaceAttribute;
+            using AutomaticInterface;
 
             namespace AutomaticInterfaceExample;
 
@@ -2427,7 +2380,7 @@ public class DemoClass
             //--------------------------------------------------------------------------------------------------
 
             using System.CodeDom.Compiler;
-            using AutomaticInterfaceAttribute;
+            using AutomaticInterface;
 
             namespace AutomaticInterfaceExample
             {