cleanup collections

fluentassertions · Dec 10, 2023 · ec4b5b4 · ec4b5b4
1 parent fde81f1
commit ec4b5b4
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 16 deletions.
diff --git a/src/FluentAssertions.Analyzers/Tips/Collections/CollectionAnalyzer.cs b/src/FluentAssertions.Analyzers/Tips/Collections/CollectionAnalyzer.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Composition;
-using FluentAssertions.Analyzers.Utilities;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
@@ -10,25 +9,13 @@
 namespace FluentAssertions.Analyzers;
 
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
-public class CollectionAnalyzer : FluentAssertionsAnalyzer
+public class CollectionAnalyzer : CollectionBaseAnalyzer
 {
     public const string DiagnosticId = "FAA0001";
     public const string Message = "Clean up FluentAssertion usage.";
 
     protected override DiagnosticDescriptor Rule => new DiagnosticDescriptor(DiagnosticId, Title, Message, Constants.Tips.Category, DiagnosticSeverity.Info, true);
 
-    protected override bool ShouldAnalyzeVariableNamedType(INamedTypeSymbol type, SemanticModel semanticModel)
-    {
-        return type.SpecialType != SpecialType.System_String
-            && type.IsTypeOrConstructedFromTypeOrImplementsType(SpecialType.System_Collections_Generic_IEnumerable_T);
-    }
-
-    protected override bool ShouldAnalyzeVariableType(ITypeSymbol type, SemanticModel semanticModel)
-    {
-        return type.SpecialType != SpecialType.System_String
-            && type.IsTypeOrConstructedFromTypeOrImplementsType(SpecialType.System_Collections_Generic_IEnumerable_T);
-    }
-
     protected override IEnumerable<FluentAssertionsCSharpSyntaxVisitor> Visitors
     {
         get

diff --git a/src/FluentAssertions.Analyzers/Tips/Collections/CollectionBaseAnalyzer.cs b/src/FluentAssertions.Analyzers/Tips/Collections/CollectionBaseAnalyzer.cs
@@ -0,0 +1,19 @@
+using FluentAssertions.Analyzers.Utilities;
+using Microsoft.CodeAnalysis;
+
+namespace FluentAssertions.Analyzers;
+
+public abstract class CollectionBaseAnalyzer : FluentAssertionsAnalyzer
+{
+    protected override bool ShouldAnalyzeVariableNamedType(INamedTypeSymbol type, SemanticModel semanticModel)
+    {
+        return type.SpecialType != SpecialType.System_String
+            && type.IsTypeOrConstructedFromTypeOrImplementsType(SpecialType.System_Collections_Generic_IEnumerable_T);
+    }
+
+    protected override bool ShouldAnalyzeVariableType(ITypeSymbol type, SemanticModel semanticModel)
+    {
+        return type.SpecialType != SpecialType.System_String
+            && type.IsTypeOrConstructedFromTypeOrImplementsType(SpecialType.System_Collections_Generic_IEnumerable_T);
+    }
+}
diff --git a/src/FluentAssertions.Analyzers/Tips/Collections/CollectionShouldHaveElementAt.cs b/src/FluentAssertions.Analyzers/Tips/Collections/CollectionShouldHaveElementAt.cs
@@ -10,7 +10,7 @@
 namespace FluentAssertions.Analyzers;
 
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
-public class CollectionShouldHaveElementAtAnalyzer : CollectionAnalyzer
+public class CollectionShouldHaveElementAtAnalyzer : CollectionBaseAnalyzer
 {
     public const string DiagnosticId = Constants.Tips.Collections.CollectionShouldHaveElementAt;
     public const string Category = Constants.Tips.Category;

diff --git a/src/FluentAssertions.Analyzers/Tips/Collections/CollectionShouldNotBeNullOrEmpty.cs b/src/FluentAssertions.Analyzers/Tips/Collections/CollectionShouldNotBeNullOrEmpty.cs
@@ -10,7 +10,7 @@
 namespace FluentAssertions.Analyzers;
 
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
-public class CollectionShouldNotBeNullOrEmptyAnalyzer : CollectionAnalyzer
+public class CollectionShouldNotBeNullOrEmptyAnalyzer : CollectionBaseAnalyzer
 {
     public const string DiagnosticId = Constants.Tips.Collections.CollectionShouldNotBeNullOrEmpty;
     public const string Category = Constants.Tips.Category;