Use GetBaseTypesAndThis()

dotnet · Jun 6, 2023 · 5ecdfd6 · 5ecdfd6
1 parent e752b27
commit 5ecdfd6
Showing 1 changed file with 2 additions and 11 deletions.
diff --git a/...crosoft.CodeQuality.Analyzers/ApiDesignGuidelines/OperatorOverloadsHaveNamedAlternates.cs b/...crosoft.CodeQuality.Analyzers/ApiDesignGuidelines/OperatorOverloadsHaveNamedAlternates.cs
@@ -99,7 +99,7 @@ private static void AnalyzeSymbol(SymbolAnalysisContext symbolContext)
                     // don't report a diagnostic on the `op_False` method because then the user would see two diagnostics for what is really one error
                     // special-case looking for `IsTrue` instance property
                     // named properties can't be overloaded so there will only ever be 0 or 1
-                    IPropertySymbol property = ClassHierarchy(typeSymbol).SelectMany(x => x.GetMembers(IsTrueText).OfType<IPropertySymbol>()).FirstOrDefault();
+                    IPropertySymbol property = typeSymbol.GetBaseTypesAndThis().SelectMany(x => x.GetMembers(IsTrueText).OfType<IPropertySymbol>()).FirstOrDefault();
                     if (property == null || property.Type.SpecialType != SpecialType.System_Boolean)
                     {
                         symbolContext.ReportDiagnostic(CreateDiagnostic(PropertyRule, GetSymbolLocation(methodSymbol), AddAlternateText, IsTrueText, operatorName));
@@ -125,7 +125,7 @@ private static void AnalyzeSymbol(SymbolAnalysisContext symbolContext)
                         unmatchedMethods.Add(expectedGroup.AlternateMethod2);
                     }
 
-                    foreach (IMethodSymbol candidateMethod in ClassHierarchy(typeSymbol).SelectMany(x => x.GetMembers().OfType<IMethodSymbol>()))
+                    foreach (IMethodSymbol candidateMethod in typeSymbol.GetBaseTypesAndThis().SelectMany(x => x.GetMembers().OfType<IMethodSymbol>()))
                     {
                         if (candidateMethod.Name == expectedGroup.AlternateMethod1 || candidateMethod.Name == expectedGroup.AlternateMethod2)
                         {
@@ -168,15 +168,6 @@ private static void AnalyzeSymbol(SymbolAnalysisContext symbolContext)
             }
         }
 
-        private static IEnumerable<ITypeSymbol> ClassHierarchy(ITypeSymbol typeSymbol)
-        {
-            while (typeSymbol is not null)
-            {
-                yield return typeSymbol;
-                typeSymbol = typeSymbol.BaseType;
-            }
-        }
-
         private static Location GetSymbolLocation(ISymbol symbol)
         {
             return symbol.OriginalDefinition.Locations.First();