Merge pull request #2286 from bjornhellander/Issue2284_Sa1125NotTriggeredIfNullableIsPrefixedWithAtSign

Updated SA1125 to also trigger for @nullable

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1125UnitTests.cs

@@ -336,6 +336,31 @@ class ClassName<T>
             await this.VerifyCSharpDiagnosticAsync(fixedCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
         }
 
+        // This is a regression test for issue 2284.
+        [Theory]
+        [InlineData("@Nullable<int>", "int?")]
+        [InlineData("System.@Nullable<int>", "int?")]
+        [InlineData("global::System.@Nullable<int>", "int?")]
+        public async Task TestNullableFieldWithAtSignPrefixInTypeAsync(string longForm, string shortForm)
+        {
+            string template = @"
+namespace System
+{{
+    class ClassName<T>
+        where T : struct
+    {{
+        {0} nullableField;
+    }}
+}}
+";
+            string testCode = string.Format(template, longForm);
+            string fixedCode = string.Format(template, shortForm);
+
+            DiagnosticResult expected = this.CSharpDiagnostic().WithLocation(7, 9);
+            await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpDiagnosticAsync(fixedCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
+
         protected override IEnumerable<DiagnosticAnalyzer> GetCSharpDiagnosticAnalyzers()
         {
             yield return new SA1125UseShorthandForNullableTypes();

StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1125UseShorthandForNullableTypes.cs

@@ -53,7 +53,7 @@ private static void HandleGenericName(SyntaxNodeAnalysisContext context)
         {
             GenericNameSyntax genericNameSyntax = (GenericNameSyntax)context.Node;
 
-            if (genericNameSyntax.Identifier.IsMissing || genericNameSyntax.Identifier.Text != "Nullable")
+            if (genericNameSyntax.Identifier.IsMissing || genericNameSyntax.Identifier.ValueText != "Nullable")
             {
                 return;
             }