Add reference to Microsoft.CodeAnalysis.AnalyzerUtilities and delete …

…forked methods (#290) I didn't know that the analyzer utilities in roslyn-analyzers produces a NuGet package. Reference that package and remove our forked copies of code.
rjmurillo · Dec 20, 2024 · 07c600e · 07c600e
1 parent 5160173
commit 07c600e
Show file tree

Hide file tree

Showing 15 changed files with 14 additions and 444 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -20,6 +20,7 @@
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" />
   </ItemGroup>
   <ItemGroup>
+    <PackageVersion Include="Microsoft.CodeAnalysis.AnalyzerUtilities" Version="3.11.0-beta1.24527.2" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
     <PackageVersion Include="GetPackFromProject" Version="1.0.10" />
     <PackageVersion Include="Nerdbank.GitVersioning" Version="3.7.112" />

diff --git a/src/Analyzers/Moq.Analyzers.csproj b/src/Analyzers/Moq.Analyzers.csproj
@@ -25,6 +25,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.AnalyzerUtilities" PrivateAssets="all" />
   </ItemGroup>
 
   <Import Project="$(RepoRoot)/src/Common/Common.projitems" Label="Shared" />

diff --git a/src/Analyzers/SquiggleCop.Baseline.yaml b/src/Analyzers/SquiggleCop.Baseline.yaml
@@ -324,7 +324,7 @@
 - {Id: ECS0700, Title: Express callbacks with delegates, Category: Design, DefaultSeverity: Note, IsEnabledByDefault: true, EffectiveSeverities: [Error], IsEverSuppressed: false}
 - {Id: ECS0800, Title: Use the Null Conditional Operator for Event Invocations, Category: Usage, DefaultSeverity: Note, IsEnabledByDefault: true, EffectiveSeverities: [Error], IsEverSuppressed: false}
 - {Id: ECS0900, Title: Minimize boxing and unboxing, Category: Performance, DefaultSeverity: Note, IsEnabledByDefault: true, EffectiveSeverities: [Error], IsEverSuppressed: true}
-- {Id: ECS1200, Title: Prefer member initializers to assignment statements, Category: Maintainability, DefaultSeverity: Note, IsEnabledByDefault: true, EffectiveSeverities: [Error], IsEverSuppressed: true}
+- {Id: ECS1200, Title: Prefer member initializers to assignment statements, Category: Maintainability, DefaultSeverity: Note, IsEnabledByDefault: true, EffectiveSeverities: [Error], IsEverSuppressed: false}
 - {Id: ECS1300, Title: Use proper initialization for static class members, Category: Initialization, DefaultSeverity: Note, IsEnabledByDefault: true, EffectiveSeverities: [Error], IsEverSuppressed: false}
 - {Id: ECS1400, Title: Minimize duplicate initialization logic, Category: Initialization, DefaultSeverity: Note, IsEnabledByDefault: true, EffectiveSeverities: [Error], IsEverSuppressed: false}
 - {Id: EM0001, Title: Switch on Enum Not Exhaustive, Category: Logic, DefaultSeverity: Error, IsEnabledByDefault: true, EffectiveSeverities: [Error], IsEverSuppressed: false}

diff --git a/src/CodeFixes/Moq.CodeFixes.csproj b/src/CodeFixes/Moq.CodeFixes.csproj
@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.AnalyzerUtilities" PrivateAssets="all" />
   </ItemGroup>
 
   <Import Project="$(RepoRoot)/src/Common/Common.projitems" Label="Shared" />

diff --git a/src/CodeFixes/SquiggleCop.Baseline.yaml b/src/CodeFixes/SquiggleCop.Baseline.yaml
@@ -324,7 +324,7 @@
 - {Id: ECS0700, Title: Express callbacks with delegates, Category: Design, DefaultSeverity: Note, IsEnabledByDefault: true, EffectiveSeverities: [Error], IsEverSuppressed: false}
 - {Id: ECS0800, Title: Use the Null Conditional Operator for Event Invocations, Category: Usage, DefaultSeverity: Note, IsEnabledByDefault: true, EffectiveSeverities: [Error], IsEverSuppressed: false}
 - {Id: ECS0900, Title: Minimize boxing and unboxing, Category: Performance, DefaultSeverity: Note, IsEnabledByDefault: true, EffectiveSeverities: [Error], IsEverSuppressed: true}
-- {Id: ECS1200, Title: Prefer member initializers to assignment statements, Category: Maintainability, DefaultSeverity: Note, IsEnabledByDefault: true, EffectiveSeverities: [Error], IsEverSuppressed: true}
+- {Id: ECS1200, Title: Prefer member initializers to assignment statements, Category: Maintainability, DefaultSeverity: Note, IsEnabledByDefault: true, EffectiveSeverities: [Error], IsEverSuppressed: false}
 - {Id: ECS1300, Title: Use proper initialization for static class members, Category: Initialization, DefaultSeverity: Note, IsEnabledByDefault: true, EffectiveSeverities: [Error], IsEverSuppressed: false}
 - {Id: ECS1400, Title: Minimize duplicate initialization logic, Category: Initialization, DefaultSeverity: Note, IsEnabledByDefault: true, EffectiveSeverities: [Error], IsEverSuppressed: false}
 - {Id: EM0001, Title: Switch on Enum Not Exhaustive, Category: Logic, DefaultSeverity: Error, IsEnabledByDefault: true, EffectiveSeverities: [Error], IsEverSuppressed: false}
@@ -516,7 +516,7 @@
 - {Id: MA0048, Title: File name must match type name, Category: Design, DefaultSeverity: Warning, IsEnabledByDefault: true, EffectiveSeverities: [Error], IsEverSuppressed: false}
 - {Id: MA0049, Title: Type name should not match containing namespace, Category: Design, DefaultSeverity: Error, IsEnabledByDefault: true, EffectiveSeverities: [Error], IsEverSuppressed: false}
 - {Id: MA0050, Title: Validate arguments correctly in iterator methods, Category: Design, DefaultSeverity: Note, IsEnabledByDefault: true, EffectiveSeverities: [Note], IsEverSuppressed: false}
-- {Id: MA0051, Title: Method is too long, Category: Design, DefaultSeverity: Warning, IsEnabledByDefault: true, EffectiveSeverities: [Error], IsEverSuppressed: true}
+- {Id: MA0051, Title: Method is too long, Category: Design, DefaultSeverity: Warning, IsEnabledByDefault: true, EffectiveSeverities: [Error], IsEverSuppressed: false}
 - {Id: MA0052, Title: Replace constant Enum.ToString with nameof, Category: Performance, DefaultSeverity: Note, IsEnabledByDefault: true, EffectiveSeverities: [Note], IsEverSuppressed: false}
 - {Id: MA0053, Title: Make class sealed, Category: Design, DefaultSeverity: Note, IsEnabledByDefault: true, EffectiveSeverities: [Note], IsEverSuppressed: false}
 - {Id: MA0054, Title: Embed the caught exception as innerException, Category: Design, DefaultSeverity: Warning, IsEnabledByDefault: true, EffectiveSeverities: [Error], IsEverSuppressed: false}

diff --git a/src/Common/Caching/BoundedCacheWithFactory.cs b/src/Common/Caching/BoundedCacheWithFactory.cs
diff --git a/src/Common/Common.csproj b/src/Common/Common.csproj
@@ -30,6 +30,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.AnalyzerUtilities" PrivateAssets="all" />
   </ItemGroup>
 
   <Import Project="$(RepoRoot)/src/Common/Common.projitems" Label="Shared" />

diff --git a/src/Common/ISymbolExtensions.cs b/src/Common/ISymbolExtensions.cs
@@ -79,51 +79,4 @@ public static bool IsOverridable(this ISymbol symbol)
     {
         return !symbol.IsSealed && (symbol.IsVirtual || symbol.IsAbstract || symbol.IsOverride);
     }
-
-    public static SymbolVisibility GetResultantVisibility(this ISymbol symbol)
-    {
-        // Start by assuming it's visible.
-        SymbolVisibility visibility = SymbolVisibility.Public;
-
-        switch (symbol.Kind)
-        {
-            case SymbolKind.Alias:
-                // Aliases are uber private.  They're only visible in the same file that they
-                // were declared in.
-                return SymbolVisibility.Private;
-
-            case SymbolKind.Parameter:
-                // Parameters are only as visible as their containing symbol
-                return GetResultantVisibility(symbol.ContainingSymbol);
-
-            case SymbolKind.TypeParameter:
-                // Type Parameters are private.
-                return SymbolVisibility.Private;
-        }
-
-        while (symbol != null && symbol.Kind != SymbolKind.Namespace)
-        {
-            switch (symbol.DeclaredAccessibility)
-            {
-                // If we see anything private, then the symbol is private.
-                case Accessibility.NotApplicable:
-                case Accessibility.Private:
-                    return SymbolVisibility.Private;
-
-                // If we see anything internal, then knock it down from public to
-                // internal.
-                case Accessibility.Internal:
-                case Accessibility.ProtectedAndInternal:
-                    visibility = SymbolVisibility.Internal;
-                    break;
-
-                    // For anything else (Public, Protected, ProtectedOrInternal), the
-                    // symbol stays at the level we've gotten so far.
-            }
-
-            symbol = symbol.ContainingSymbol;
-        }
-
-        return visibility;
-    }
 }
diff --git a/src/Common/ITypeSymbolExtensions.cs b/src/Common/ITypeSymbolExtensions.cs
@@ -12,7 +12,7 @@ internal static class ITypeSymbolExtensions
     /// <returns>The type and any inherited types.</returns>
     public static IEnumerable<ITypeSymbol> GetBaseTypesAndThis(this ITypeSymbol type)
     {
-        var current = type;
+        ITypeSymbol? current = type;
         while (current is not null)
         {
             yield return current;

diff --git a/src/Common/SymbolVisibility.cs b/src/Common/SymbolVisibility.cs
diff --git a/src/Common/WellKnown/KnownSymbols.cs b/src/Common/WellKnown/KnownSymbols.cs
@@ -1,4 +1,6 @@
-namespace Moq.Analyzers.Common.WellKnown;
+using Analyzer.Utilities;
+
+namespace Moq.Analyzers.Common.WellKnown;
 
 /// <summary>
 /// Main entrypoint to access well-known symbols for the analyzer.

diff --git a/src/Common/WellKnown/MoqKnownSymbols.cs b/src/Common/WellKnown/MoqKnownSymbols.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using Analyzer.Utilities;
 
 namespace Moq.Analyzers.Common.WellKnown;