Fixes #34

Vannevelj · Apr 16, 2020 · 285bb69 · 285bb69
1 parent e3a438f
commit 285bb69
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 20 deletions.
diff --git a/sharpsource/sharpsource.Test/ElementaryMethodsOfTypeInCollectionNotOverriddenTests.cs b/sharpsource/sharpsource.Test/ElementaryMethodsOfTypeInCollectionNotOverriddenTests.cs
@@ -28,7 +28,7 @@ void Method()
     class MyCollectionItem {}
 }";
 
-            VerifyDiagnostic(original, ElementaryMethodsOfTypeInCollectionNotOverriddenAnalyzer.Rule.MessageFormat.ToString());
+            VerifyDiagnostic(original, "Implement Equals() and GetHashCode() methods of type MyCollectionItem for use in a collection.");
         }
 
         [TestMethod]
@@ -70,7 +70,7 @@ void Method()
     struct MyCollectionItem {}
 }";
 
-            VerifyDiagnostic(original, ElementaryMethodsOfTypeInCollectionNotOverriddenAnalyzer.Rule.MessageFormat.ToString());
+            VerifyDiagnostic(original, "Implement Equals() and GetHashCode() methods of type MyCollectionItem for use in a collection.");
         }
 
         [TestMethod]
@@ -97,7 +97,7 @@ public override bool Equals(object obj)
     }
 }";
 
-            VerifyDiagnostic(original, ElementaryMethodsOfTypeInCollectionNotOverriddenAnalyzer.Rule.MessageFormat.ToString());
+            VerifyDiagnostic(original, "Implement Equals() and GetHashCode() methods of type MyCollectionItem for use in a collection.");
         }
 
         [TestMethod]
@@ -124,7 +124,7 @@ public override bool Equals(object obj)
     }
 }";
 
-            VerifyDiagnostic(original, ElementaryMethodsOfTypeInCollectionNotOverriddenAnalyzer.Rule.MessageFormat.ToString());
+            VerifyDiagnostic(original, "Implement Equals() and GetHashCode() methods of type MyCollectionItem for use in a collection.");
         }
 
         [TestMethod]
@@ -151,7 +151,7 @@ public override int GetHashCode()
     }
 }";
 
-            VerifyDiagnostic(original, ElementaryMethodsOfTypeInCollectionNotOverriddenAnalyzer.Rule.MessageFormat.ToString());
+            VerifyDiagnostic(original, "Implement Equals() and GetHashCode() methods of type MyCollectionItem for use in a collection.");
         }
 
         [TestMethod]
@@ -178,7 +178,7 @@ public override int GetHashCode()
     }
 }";
 
-            VerifyDiagnostic(original, ElementaryMethodsOfTypeInCollectionNotOverriddenAnalyzer.Rule.MessageFormat.ToString());
+            VerifyDiagnostic(original, "Implement Equals() and GetHashCode() methods of type MyCollectionItem for use in a collection.");
         }
 
         [TestMethod]
@@ -264,8 +264,8 @@ class MyCollectionItem {}
 }";
 
             VerifyDiagnostic(original,
-                ElementaryMethodsOfTypeInCollectionNotOverriddenAnalyzer.Rule.MessageFormat.ToString(),
-                ElementaryMethodsOfTypeInCollectionNotOverriddenAnalyzer.Rule.MessageFormat.ToString());
+                "Implement Equals() and GetHashCode() methods of type MyCollectionItem for use in a collection.",
+                "Implement Equals() and GetHashCode() methods of type MyCollectionItem for use in a collection.");
         }
 
         [TestMethod]
@@ -286,8 +286,7 @@ void Method()
     class MyCollectionItem {}
 }";
 
-            VerifyDiagnostic(original,
-                ElementaryMethodsOfTypeInCollectionNotOverriddenAnalyzer.Rule.MessageFormat.ToString());
+            VerifyDiagnostic(original, "Implement Equals() and GetHashCode() methods of type MyCollectionItem for use in a collection.");
         }
 
         [TestMethod]

diff --git a/...TypeInCollectionNotOverridden/ElementaryMethodsOfTypeInCollectionNotOverriddenAnalyzer.cs b/...TypeInCollectionNotOverridden/ElementaryMethodsOfTypeInCollectionNotOverriddenAnalyzer.cs
@@ -25,9 +25,7 @@ public class ElementaryMethodsOfTypeInCollectionNotOverriddenAnalyzer : Diagnost
 
         private void AnalyzeSymbol(SyntaxNodeAnalysisContext context)
         {
-            var objectTypeInfo = context.SemanticModel.GetTypeInfo(context.Node).Type as INamedTypeSymbol;
-
-            if (objectTypeInfo == null)
+            if (!( context.SemanticModel.GetTypeInfo(context.Node).Type is INamedTypeSymbol objectTypeInfo ))
             {
                 return;
             }
@@ -40,8 +38,8 @@ private void AnalyzeSymbol(SyntaxNodeAnalysisContext context)
                 return;
             }
 
-            var objectType = ( (ObjectCreationExpressionSyntax)context.Node ).Type as GenericNameSyntax;
-            if (objectType == null)
+            var node = ( (ObjectCreationExpressionSyntax)context.Node );
+            if (!( node.Type is GenericNameSyntax objectType ))
             {
                 return;
             }
@@ -78,7 +76,7 @@ private void AnalyzeSymbol(SyntaxNodeAnalysisContext context)
 
                 if (!implementsEquals || !implementsGetHashCode)
                 {
-                    context.ReportDiagnostic(Diagnostic.Create(Rule, genericType.GetLocation()));
+                    context.ReportDiagnostic(Diagnostic.Create(Rule, genericType.GetLocation(), genericTypeInfo.Name));
                 }
             }
         }

diff --git a/sharpsource/sharpsource/Resources.Designer.cs b/sharpsource/sharpsource/Resources.Designer.cs
diff --git a/sharpsource/sharpsource/Resources.resx b/sharpsource/sharpsource/Resources.resx
@@ -187,10 +187,11 @@
     <value>The operands of a divisive expression are both integers and result in an implicit rounding.</value>
   </data>
   <data name="ElementaryMethodsOfTypeInCollectionNotOverriddenAnalyzerMessage" xml:space="preserve">
-    <value>Implement elementary methods of type used in collection.</value>
+    <value>Implement Equals() and GetHashCode() methods of type {0} for use in a collection.</value>
+    <comment>{0} - Type name</comment>
   </data>
   <data name="ElementaryMethodsOfTypeInCollectionNotOverriddenAnalyzerTitle" xml:space="preserve">
-    <value>Implement elementary methods for a type used in a collection.</value>
+    <value>Implement Equals() and GetHashcode() methods for a type used in a collection.</value>
   </data>
   <data name="EnumCanHaveFlagsAttributeAnalyzerMessage" xml:space="preserve">
     <value>Enum can have [Flags] attribute.</value>