Updated after comments

vweijsters · vweijsters · commit ee48913376d4 · 2018-02-08T23:40:53.000+01:00
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/ReadabilityResources.Designer.cs b/StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/ReadabilityResources.Designer.cs
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/ReadabilityResources.resx b/StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/ReadabilityResources.resx
@@ -526,16 +526,16 @@
     <value>Qualify using directive</value>
   </data>
   <data name="SA1135Description" xml:space="preserve">
-    <value>All using directives must be qualified.</value>
+    <value>All using directives should be qualified.</value>
   </data>
   <data name="SA1135MessageFormatNamespace" xml:space="preserve">
-    <value>Using directive for namespace '{0}' must be qualified</value>
+    <value>Using directive for namespace '{0}' should be qualified</value>
   </data>
   <data name="SA1135MessageFormatType" xml:space="preserve">
-    <value>Using directive for type '{0}' must be qualified</value>
+    <value>Using directive for type '{0}' should be qualified</value>
   </data>
   <data name="SA1135Title" xml:space="preserve">
-    <value>Using directives must be qualified</value>
+    <value>Using directives should be qualified</value>
   </data>
   <data name="SX1101CodeFix" xml:space="preserve">
     <value>Remove 'this.' prefix</value>
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1135UsingDirectivesMustBeQualified.cs b/StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1135UsingDirectivesMustBeQualified.cs
@@ -77,8 +77,7 @@ private static void CheckUsingDeclaration(SyntaxNodeAnalysisContext context, Usi
                 return;
             }
 
-            string usingString = usingDirective.Name.ToString();
-            if (usingString.IndexOf("::", StringComparison.Ordinal) >= 0)
+            if (usingDirective.HasNamespaceAliasQualifier())
             {
                 // global qualified namespaces are OK.
                 return;
@@ -92,6 +91,7 @@ private static void CheckUsingDeclaration(SyntaxNodeAnalysisContext context, Usi
             }
 
             string symbolString = symbol.ToString();
+            string usingString = usingDirective.Name.ToString();
             if ((symbolString != usingString) && !usingDirective.StartsWithAlias(context.SemanticModel, context.CancellationToken))
             {
                 switch (symbol.Kind)
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/StyleCop.Analyzers.csproj b/StyleCop.Analyzers/StyleCop.Analyzers/StyleCop.Analyzers.csproj
@@ -37,4 +37,19 @@
     <None Include="**\*.json" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="ReadabilityRules\ReadabilityResources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>ReadabilityResources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="ReadabilityRules\ReadabilityResources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>ReadabilityResources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
 </Project>
diff --git a/documentation/SA1135.md b/documentation/SA1135.md
@@ -22,6 +22,7 @@ A using directive is not qualified.
 ## Rule description
 
  A violation of this rule occurs when a using directive is contained within a namespace and is not qualified.
+ Note that alias definitions of classes within the same namespace do not need to be qualified.
 
 For example, the following code would produce a violation of this rule:
 
@@ -40,6 +41,8 @@ namespace System.Threading
 {
     using System.IO;
     using System.Threading.Tasks;
+
+	using T = Thread;
 }
 ```
 

Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,7 @@ private static void CheckUsingDeclaration(SyntaxNodeAnalysisContext context, Usi`
`77`	`77`	`return;`
`78`	`78`	`}`
`79`	`79`
`80`		`- string usingString = usingDirective.Name.ToString();`
`81`		`- if (usingString.IndexOf("::", StringComparison.Ordinal) >= 0)`
	`80`	`+ if (usingDirective.HasNamespaceAliasQualifier())`
`82`	`81`	`{`
`83`	`82`	`// global qualified namespaces are OK.`
`84`	`83`	`return;`
`@@ -92,6 +91,7 @@ private static void CheckUsingDeclaration(SyntaxNodeAnalysisContext context, Usi`
`92`	`91`	`}`
`93`	`92`
`94`	`93`	`string symbolString = symbol.ToString();`
	`94`	`+ string usingString = usingDirective.Name.ToString();`
`95`	`95`	`if ((symbolString != usingString) && !usingDirective.StartsWithAlias(context.SemanticModel, context.CancellationToken))`
`96`	`96`	`{`
`97`	`97`	`switch (symbol.Kind)`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ A using directive is not qualified.`
`22`	`22`	`## Rule description`
`23`	`23`
`24`	`24`	`A violation of this rule occurs when a using directive is contained within a namespace and is not qualified.`
	`25`	`+ Note that alias definitions of classes within the same namespace do not need to be qualified.`
`25`	`26`
`26`	`27`	`For example, the following code would produce a violation of this rule:`
`27`	`28`
`@@ -40,6 +41,8 @@ namespace System.Threading`
`40`	`41`	`{`
`41`	`42`	`using System.IO;`
`42`	`43`	`using System.Threading.Tasks;`
	`44`	`+`
	`45`	`+ using T = Thread;`
`43`	`46`	`}`
`44`	`47`	```
`45`	`48`