merged crwsolutions branch

codecentric · Nov 29, 2024 · 2920be4 · 2920be4
2 parents edc3965 + 6edf896
commit 2920be4
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 31 deletions.
diff --git a/AutomaticInterface/AutomaticInterface/AutomaticInterface.csproj b/AutomaticInterface/AutomaticInterface/AutomaticInterface.csproj
@@ -25,11 +25,11 @@
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <EnableNETAnalyzers>True</EnableNETAnalyzers>
         <AnalysisLevel>latest-Recommended</AnalysisLevel>
-        <Version>5.0.2</Version>
+        <Version>5.0.3</Version>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <NoWarn>1701;1702;NU5128</NoWarn>
-        <PackageReleaseNotes>Use ForAttributeWithMetadataName to improve performance</PackageReleaseNotes>
+        <PackageReleaseNotes>Query members only once. Small optimization.</PackageReleaseNotes>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugGenerator|AnyCPU'">

diff --git a/AutomaticInterface/AutomaticInterface/Builder.cs b/AutomaticInterface/AutomaticInterface/Builder.cs
@@ -41,9 +41,17 @@ is not ClassDeclarationSyntax classSyntax
 
         interfaceGenerator.AddClassDocumentation(GetDocumentationForClass(classSyntax));
         interfaceGenerator.AddGeneric(GetGeneric(classSyntax));
-        AddPropertiesToInterface(typeSymbol, interfaceGenerator);
-        AddMethodsToInterface(typeSymbol, interfaceGenerator);
-        AddEventsToInterface(typeSymbol, interfaceGenerator);
+
+        var members = typeSymbol
+            .GetAllMembers()
+            .Where(x => x.DeclaredAccessibility == Accessibility.Public)
+            .Where(x => !x.IsStatic)
+            .Where(x => !HasIgnoreAttribute(x))
+            .ToList();
+
+        AddPropertiesToInterface(members, interfaceGenerator);
+        AddMethodsToInterface(members, interfaceGenerator);
+        AddEventsToInterface(members, interfaceGenerator);
 
         var generatedCode = interfaceGenerator.Build();
 
@@ -70,19 +78,12 @@ private static string GetNameSpace(ISymbol typeSymbol)
             : customNs!;
     }
 
-    private static void AddMethodsToInterface(
-        ITypeSymbol classSymbol,
-        InterfaceBuilder codeGenerator
-    )
+    private static void AddMethodsToInterface(List<ISymbol> members, InterfaceBuilder codeGenerator)
     {
-        classSymbol
-            .GetAllMembers()
+        members
             .Where(x => x.Kind == SymbolKind.Method)
             .OfType<IMethodSymbol>()
-            .Where(x => x.DeclaredAccessibility == Accessibility.Public)
             .Where(x => x.MethodKind == MethodKind.Ordinary)
-            .Where(x => !x.IsStatic)
-            .Where(x => !HasIgnoreAttribute(x))
             .Where(x => x.ContainingType.Name != nameof(Object))
             .Where(x => !HasIgnoreAttribute(x))
             .GroupBy(x => x.ToDisplayString(FullyQualifiedDisplayFormat))
@@ -171,18 +172,11 @@ private static bool IsNullable(ITypeSymbol typeSymbol)
         return false;
     }
 
-    private static void AddEventsToInterface(
-        ITypeSymbol classSymbol,
-        InterfaceBuilder codeGenerator
-    )
+    private static void AddEventsToInterface(List<ISymbol> members, InterfaceBuilder codeGenerator)
     {
-        classSymbol
-            .GetAllMembers()
+        members
             .Where(x => x.Kind == SymbolKind.Event)
             .OfType<IEventSymbol>()
-            .Where(x => x.DeclaredAccessibility == Accessibility.Public)
-            .Where(x => !x.IsStatic)
-            .Where(x => !HasIgnoreAttribute(x))
             .GroupBy(x => x.ToDisplayString(FullyQualifiedDisplayFormat))
             .Select(g => g.First())
             .ToList()
@@ -252,18 +246,14 @@ private static string GetRefKind(IParameterSymbol x)
     }
 
     private static void AddPropertiesToInterface(
-        ITypeSymbol classSymbol,
+        List<ISymbol> members,
         InterfaceBuilder interfaceGenerator
     )
     {
-        classSymbol
-            .GetAllMembers()
+        members
             .Where(x => x.Kind == SymbolKind.Property)
             .OfType<IPropertySymbol>()
-            .Where(x => x.DeclaredAccessibility == Accessibility.Public)
-            .Where(x => !x.IsStatic)
             .Where(x => !x.IsIndexer)
-            .Where(x => !HasIgnoreAttribute(x))
             .GroupBy(x => x.Name)
             .Select(g => g.First())
             .ToList()

diff --git a/README.md b/README.md
@@ -185,10 +185,18 @@ Should be simply a build and run Tests
 
 ## Changelog
 
-### 5.0.0
+### 5.0.3
+
+- Query members only once. Small optimization. Thanks, @crwsolutions!
+
+### 5.0.2
+
+- Fully qualify type references; remove usings . Thanks, @simonmckenzie!
+
+### 5.0.1
 
 - Sync DemoClass and actual generated code with README. Thanks, @crwsolutions!
--  Removed manual attribute in TestNuget project. Thanks, @crwsolutions!
+- Removed manual attribute in TestNuget project. Thanks, @crwsolutions!
 
 ### 5.0.0