bug: GetReturnAttributes for properties, indexes and events

beakona · Mar 15, 2024 · 7a45d90 · 7a45d90
1 parent 11bf34c
commit 7a45d90
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 24 deletions.
diff --git a/BeaKona.AutoInterfaceGenerator/BeaKona.AutoInterfaceGenerator.csproj b/BeaKona.AutoInterfaceGenerator/BeaKona.AutoInterfaceGenerator.csproj
@@ -13,7 +13,7 @@
     <RepositoryUrl>https://github.com/beakona/AutoInterface</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_AddAnalyzersToOutput</TargetsForTfmSpecificContentInPackage>
-    <Version>1.0.37</Version>
+    <Version>1.0.38</Version>
     <IsRoslynComponent>true</IsRoslynComponent>
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
   </PropertyGroup>

diff --git a/BeaKona.AutoInterfaceGenerator/CSharpCodeTextWriter.cs b/BeaKona.AutoInterfaceGenerator/CSharpCodeTextWriter.cs
@@ -413,28 +413,9 @@ private IEnumerable<AttributeData> GetForwardAttributes(ISymbol symbol)
         }
     }
 
-    private IEnumerable<AttributeData> GetReturnAttributes(IPropertySymbol method)
+    private IEnumerable<AttributeData> GetReturnAttributes(ISymbol symbol)
     {
-        var attributes = method.GetAttributes().Where(IsPublicAccess).ToList();
-
-        foreach (var attribute in attributes)
-        {
-            if (attribute.AttributeClass is INamedTypeSymbol attributeClass)
-            {
-                foreach (var typeSymbol in this.returnAttributeSymbols)
-                {
-                    if (attributeClass.Equals(typeSymbol, SymbolEqualityComparer.Default))
-                    {
-                        yield return attribute;
-                        break;
-                    }
-                }
-            }
-        }
-    }
-    private IEnumerable<AttributeData> GetReturnAttributes(IMethodSymbol method)
-    {
-        var attributes = method.GetReturnTypeAttributes().Where(IsPublicAccess).ToList();
+        var attributes = symbol.GetAttributes().Where(IsPublicAccess).ToList();
 
         foreach (var attribute in attributes)
         {
@@ -673,7 +654,7 @@ public void WritePropertyDefinition(SourceBuilder builder, IPropertySymbol prope
         PartialTemplate? setterTemplate = this.GetMatchedTemplates(references, setterTarget, property.IsIndexer ? "this" : property.Name);
 
         this.WriteForwardAttributes(builder, property);
-        this.WriteReturnAttributes(builder, GetReturnAttributes(property));
+        this.WriteReturnAttributes(builder, this.GetReturnAttributes(property));
 
         builder.AppendIndentation();
         this.WriteTypeReference(builder, property.Type, scope);
@@ -842,7 +823,7 @@ public void WriteEventDefinition(SourceBuilder builder, IEventSymbol @event, Sco
         PartialTemplate? removerTemplate = this.GetMatchedTemplates(references, AutoInterfaceTargets.EventRemover, @event.Name);
 
         this.WriteForwardAttributes(builder, @event);
-        this.WriteReturnAttributes(builder, @event.Type.GetAttributes());
+        this.WriteReturnAttributes(builder, this.GetReturnAttributes(@event));
 
         builder.AppendIndentation();
         builder.Append("event");