Merge pull request #3135 from VitaliAntonov/issue-2618

Improve SA1135 handling of static usings

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1135UnitTests.cs

@@ -103,18 +103,6 @@ namespace System.Threading
             await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
         }
 
-        [Fact]
-        public async Task TestStaticUsingsAsync()
-        {
-            const string testCode = @"
-namespace System.Threading
-{
-    using static Console;
-}";
-
-            await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
-        }
-
         [Fact]
         public async Task TestFixAllAsync()
         {
@@ -455,5 +443,31 @@ namespace System
 
             await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
         }
+
+        [Fact]
+        [WorkItem(2618, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/2618")]
+        public async Task TestUnqualifiedStaticUsingsAsync()
+        {
+            const string testCode = @"
+namespace System.Threading
+{
+    using static Console;
+}
+";
+
+            const string fixedCode = @"
+namespace System.Threading
+{
+    using static System.Console;
+}
+";
+
+            DiagnosticResult[] expected =
+            {
+                Diagnostic(SA1135UsingDirectivesMustBeQualified.DescriptorType).WithLocation(4, 5).WithArguments("System.Console"),
+            };
+
+            await VerifyCSharpFixAsync(testCode, expected, fixedCode, CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1135UsingDirectivesMustBeQualified.cs

@@ -73,12 +73,6 @@ private static void CheckUsingDeclaration(SyntaxNodeAnalysisContext context, Usi
                 return;
             }
 
-            if (!usingDirective.StaticKeyword.IsKind(SyntaxKind.None))
-            {
-                // using static types is not considered.
-                return;
-            }
-
             if (usingDirective.HasNamespaceAliasQualifier())
             {
                 // global qualified namespaces are OK.