Fixing issue #17

beakona · Nov 30, 2023 · dc35de0 · dc35de0
1 parent 746ff19
commit dc35de0
Show file tree

Hide file tree

Showing 11 changed files with 115 additions and 88 deletions.
diff --git a/AutoInterfaceSample/Program.cs b/AutoInterfaceSample/Program.cs
@@ -13,60 +13,41 @@ public static void Main()
             //p.Method(1, out f, ref g, "t", 1, 2, 3);
 
             IPrintableComplex p = new Person2();
-            //p.Print();
+            p.Print();
             p.PrintComplex();
         }
     }
 
     interface IPrintableComplex
     {
-        [Obsolete("ok", false)]
         void Print();
         void PrintComplex();
-
-        [Obsolete("12")]
-        int Count
-        {
-            get;
-            [Obsolete("ok3")]
-            set;
-        }
-
-        int Count2
-        {
-            //[Obsolete("cd2")]
-            get;
-        }
-
-        [Obsolete("cd")]
-        int this[int a]
-        {
-            [Obsolete("cd3")]
-            get;
-        }
     }
 
-    public class SimplePrinter
+    public class SimplePrinter //: IPrintableComplex
     {
         public void Print() { Console.WriteLine("OK"); }
-        public void PrintComplex() { Console.WriteLine("OK2"); }
-
-        public int Count
-        {
-            get;
-            set;
-        }
-
-        public int Count2 => 10;
-        public int this[int a] => 10;
+        public void PrintComplex() { Console.WriteLine("OKC"); }
     }
 
-    public partial class Person2 : IPrintableComplex
+    public partial class Person2 //: IPrintableComplex
     {
-        [BeaKona.AutoInterface(typeof(IPrintableComplex), AllowMissingMembers = false)]
-        private readonly SimplePrinter aspect1 = new SimplePrinter();
+        //[BeaKona.AutoInterface(typeof(IPrintableComplex), AllowMissingMembers = true, MemberMatch = BeaKona.MemberMatchTypes.Public)]
+        //private readonly SimplePrinter aspect1 = new SimplePrinter();
+
+        //[BeaKona.AutoInterface(typeof(IPrintableComplex), AllowMissingMembers = true, MemberMatch = BeaKona.MemberMatchTypes.Explicit)]
+        //private readonly SimplePrinter aspect2 = new SimplePrinter();
+
+        [BeaKona.AutoInterface(typeof(IPrintableComplex), AllowMissingMembers = true)]
+        private readonly SimplePrinter aspect3 = new SimplePrinter();
+
+        //[BeaKona.AutoInterface(typeof(IPrintableComplex), AllowMissingMembers = true, MemberMatch = BeaKona.MemberMatchTypes.Any)]
+        //private readonly SimplePrinter aspect4 = new SimplePrinter();
+
+        //void IPrintableComplex.PrintComplex() => Console.WriteLine("OKC2");
 
         public void PrintComplex() { Console.WriteLine("Oh, K."); }
+        //void IPrintableComplex.PrintComplex() { Console.WriteLine("Oh, K."); }
     }
 
 

diff --git a/BeaKona.AutoInterfaceAttributes/AutoInterfaceAttribute.cs b/BeaKona.AutoInterfaceAttributes/AutoInterfaceAttribute.cs
@@ -23,4 +23,5 @@ public AutoInterfaceAttribute(Type type)
     public string? TemplateBody { get; set; }
     public string? TemplateFileName { get; set; }
     public bool AllowMissingMembers { get; set; }
+    public MemberMatchTypes MemberMatch { get; set; }
 }
diff --git a/BeaKona.AutoInterfaceAttributes/MemberMatchTypes.cs b/BeaKona.AutoInterfaceAttributes/MemberMatchTypes.cs
@@ -0,0 +1,8 @@
+namespace BeaKona;
+
+public enum MemberMatchTypes
+{
+    Explicit,
+    Public,
+    Any,
+}
diff --git a/BeaKona.AutoInterfaceGenerator/AutoInterfaceRecord.cs b/BeaKona.AutoInterfaceGenerator/AutoInterfaceRecord.cs
@@ -4,7 +4,7 @@ namespace BeaKona.AutoInterfaceGenerator;
 
 internal sealed class AutoInterfaceRecord : IMemberInfo
 {
-    public AutoInterfaceRecord(ISymbol member, ITypeSymbol receiverType, INamedTypeSymbol interfaceType, TemplateDefinition? template, List<PartialTemplate> templateParts, bool bySignature, bool preferCoalesce, bool allowMissingMembers)
+    public AutoInterfaceRecord(ISymbol member, ITypeSymbol receiverType, INamedTypeSymbol interfaceType, TemplateDefinition? template, List<PartialTemplate> templateParts, bool bySignature, bool preferCoalesce, bool allowMissingMembers, MemberMatchTypes memberMatch)
     {
         this.Member = member;
         this.ReceiverType = receiverType;
@@ -14,6 +14,7 @@ public AutoInterfaceRecord(ISymbol member, ITypeSymbol receiverType, INamedTypeS
         this.BySignature = bySignature;
         this.PreferCoalesce = preferCoalesce;
         this.AllowMissingMembers = allowMissingMembers;
+        this.MemberMatch = memberMatch;
     }
 
     public ISymbol Member { get; }
@@ -24,4 +25,5 @@ public AutoInterfaceRecord(ISymbol member, ITypeSymbol receiverType, INamedTypeS
     public bool BySignature { get; }
     public bool PreferCoalesce { get; }
     public bool AllowMissingMembers { get; }
+    public MemberMatchTypes MemberMatch { get; }
 }
diff --git a/BeaKona.AutoInterfaceGenerator/AutoInterfaceSourceGenerator.cs b/BeaKona.AutoInterfaceGenerator/AutoInterfaceSourceGenerator.cs
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.30</Version>
+    <Version>1.0.31</Version>
     <IsRoslynComponent>true</IsRoslynComponent>
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
   </PropertyGroup>

diff --git a/BeaKona.AutoInterfaceGenerator/ComparerBySignature.cs b/BeaKona.AutoInterfaceGenerator/ComparerBySignature.cs
@@ -8,6 +8,8 @@ public sealed class ComparerBySignature : IEqualityComparer<ISymbol>
 
     public bool Equals(ISymbol s1, ISymbol s2)
     {
+        //should we check s1/s2.DeclaredAccessibility to be Accessibility.Public || Accessibility.NotApplicable??
+
         if (s1.Kind == s2.Kind)
         {
             if (s1.Kind == SymbolKind.Method)

diff --git a/BeaKona.AutoInterfaceGenerator/Helpers.cs b/BeaKona.AutoInterfaceGenerator/Helpers.cs
@@ -21,6 +21,7 @@ public static void ReportDiagnostic(GeneratorExecutionContext context, string id
         var lDescription = new LocalizableResourceString(description, AutoInterfaceResource.ResourceManager, typeof(AutoInterfaceResource));
         var category = typeof(AutoInterfaceSourceGenerator).Namespace;
         var link = "https://github.com/beakona/AutoInterface";
+
         var dd = new DiagnosticDescriptor(id, lTitle, lMessage, category, severity, true, lDescription, link, WellKnownDiagnosticTags.NotConfigurable);
         var d = Diagnostic.Create(dd, location, messageArgs);
         context.ReportDiagnostic(d);

diff --git a/BeaKona.AutoInterfaceGenerator/IMemberInfo.cs b/BeaKona.AutoInterfaceGenerator/IMemberInfo.cs
@@ -12,4 +12,5 @@ internal interface IMemberInfo
     bool BySignature { get; }
     bool PreferCoalesce { get; }
     bool AllowMissingMembers { get; }
+    MemberMatchTypes MemberMatch { get; }
 }
diff --git a/BeaKona.AutoInterfaceGenerator/ITypeSymbolExtensions.cs b/BeaKona.AutoInterfaceGenerator/ITypeSymbolExtensions.cs
@@ -73,12 +73,12 @@ public static bool IsMemberImplementedExplicitly(this ITypeSymbol @this, ISymbol
         };
     }
 
-    public static bool IsMemberImplemented(this ITypeSymbol @this, ISymbol member)
-    {
-        ISymbol? implementation = @this.FindImplementationForInterfaceMember(member);
+    //public static bool IsMemberImplemented(this ITypeSymbol @this, ISymbol member)
+    //{
+    //    ISymbol? implementation = @this.FindImplementationForInterfaceMember(member);
 
-        return implementation is not null && implementation.IsStatic == false && implementation.ContainingType.Equals(@this, SymbolEqualityComparer.Default);
-    }
+    //    return implementation is not null && implementation.IsStatic == false && implementation.ContainingType.Equals(@this, SymbolEqualityComparer.Default);
+    //}
 
     public static ISymbol? FindImplementationForInterfaceMemberBySignature(this ITypeSymbol @this, ISymbol interfaceMember)
     {

diff --git a/BeaKona.AutoInterfaceGenerator/Templates/PartialTemplate.cs b/BeaKona.AutoInterfaceGenerator/Templates/PartialTemplate.cs
@@ -30,7 +30,7 @@ public PartialTemplate(AutoInterfaceTargets memberTargets, Regex? memberFilter,
                 {
                     if (ts[1].template.MemberFilter != null)
                     {
-                        Helpers.ReportDiagnostic(context, "BK-AG16", nameof(AutoInterfaceResource.AG16_title), nameof(AutoInterfaceResource.AG16_message), nameof(AutoInterfaceResource.AG16_description), DiagnosticSeverity.Error, ts[0].reference,
+                        Helpers.ReportDiagnostic(context, "BKAG16", nameof(AutoInterfaceResource.AG16_title), nameof(AutoInterfaceResource.AG16_message), nameof(AutoInterfaceResource.AG16_description), DiagnosticSeverity.Error, ts[0].reference,
                             name);
                         return null;
                     }
@@ -47,13 +47,13 @@ public PartialTemplate(AutoInterfaceTargets memberTargets, Regex? memberFilter,
                     }
                     else
                     {
-                        Helpers.ReportDiagnostic(context, "BK-AG16", nameof(AutoInterfaceResource.AG16_title), nameof(AutoInterfaceResource.AG16_message), nameof(AutoInterfaceResource.AG16_description), DiagnosticSeverity.Error, ts[0].reference,
+                        Helpers.ReportDiagnostic(context, "BKAG16", nameof(AutoInterfaceResource.AG16_title), nameof(AutoInterfaceResource.AG16_message), nameof(AutoInterfaceResource.AG16_description), DiagnosticSeverity.Error, ts[0].reference,
                             name);
                         return null;
                     }
                 }
             default:
-                Helpers.ReportDiagnostic(context, "BK-AG16", nameof(AutoInterfaceResource.AG16_title), nameof(AutoInterfaceResource.AG16_message), nameof(AutoInterfaceResource.AG16_description), DiagnosticSeverity.Error, ts[0].reference,
+                Helpers.ReportDiagnostic(context, "BKAG16", nameof(AutoInterfaceResource.AG16_title), nameof(AutoInterfaceResource.AG16_message), nameof(AutoInterfaceResource.AG16_description), DiagnosticSeverity.Error, ts[0].reference,
                     name);
                 return null;
         }