Merge pull request #1467 from sharwell/sa1017-fixall

sharwell · sharwell · commit 55cdd42c67bf · 2015-09-13T15:36:07.000-05:00
Update SA1017 to use OpenCloseSpacingCodeFixProvider
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1017UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1017UnitTests.cs
@@ -100,7 +100,7 @@ class ClassName2
 {
 }
 
-[System.Obsolete/*comment*/]
+[System.Obsolete /*comment*/]
 class ClassNam3
 {
 }
@@ -170,7 +170,7 @@ protected override IEnumerable<DiagnosticAnalyzer> GetCSharpDiagnosticAnalyzers(
         /// <inheritdoc/>
         protected override CodeFixProvider GetCSharpCodeFixProvider()
         {
-            return new SA1017CodeFixProvider();
+            return new OpenCloseSpacingCodeFixProvider();
         }
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/OpenCloseSpacingCodeFixProvider.cs b/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/OpenCloseSpacingCodeFixProvider.cs
@@ -50,6 +50,7 @@ public class OpenCloseSpacingCodeFixProvider : CodeFixProvider
                 SA1014OpeningGenericBracketsMustBeSpacedCorrectly.DiagnosticId,
                 SA1015ClosingGenericBracketsMustBeSpacedCorrectly.DiagnosticId,
                 SA1016OpeningAttributeBracketsMustBeSpacedCorrectly.DiagnosticId,
+                SA1017ClosingAttributeBracketsMustBeSpacedCorrectly.DiagnosticId,
                 SA1019MemberAccessSymbolsMustBeSpacedCorrectly.DiagnosticId,
                 SA1020IncrementDecrementSymbolsMustBeSpacedCorrectly.DiagnosticId,
                 SA1021NegativeSignsMustBeSpacedCorrectly.DiagnosticId,
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1017ClosingAttributeBracketsMustBeSpacedCorrectly.cs b/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1017ClosingAttributeBracketsMustBeSpacedCorrectly.cs
@@ -103,7 +103,7 @@ private static void HandleCloseBracketToken(SyntaxTreeAnalysisContext context, S
             }
 
             // Closing attribute brackets must not be preceded by a space.
-            context.ReportDiagnostic(Diagnostic.Create(Descriptor, token.GetLocation()));
+            context.ReportDiagnostic(Diagnostic.Create(Descriptor, token.GetLocation(), OpenCloseSpacingCodeFixProvider.RemoveImmediatePreceding));
         }
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1017CodeFixProvider.cs b/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1017CodeFixProvider.cs
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SpacingResources.Designer.cs b/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SpacingResources.Designer.cs
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SpacingResources.resx b/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SpacingResources.resx
@@ -177,9 +177,6 @@
   <data name="SA1016Title" xml:space="preserve">
     <value>Opening attribute brackets must be spaced correctly</value>
   </data>
-  <data name="SA1017CodeFix" xml:space="preserve">
-    <value>Fix spacing</value>
-  </data>
   <data name="SA1017Description" xml:space="preserve">
     <value>A closing attribute bracket within a C# element is not spaced correctly.</value>
   </data>
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/StyleCop.Analyzers.csproj b/StyleCop.Analyzers/StyleCop.Analyzers/StyleCop.Analyzers.csproj
@@ -353,7 +353,6 @@
     <Compile Include="SpacingRules\SA1015ClosingGenericBracketsMustBeSpacedCorrectly.cs" />
     <Compile Include="SpacingRules\SA1016OpeningAttributeBracketsMustBeSpacedCorrectly.cs" />
     <Compile Include="SpacingRules\SA1017ClosingAttributeBracketsMustBeSpacedCorrectly.cs" />
-    <Compile Include="SpacingRules\SA1017CodeFixProvider.cs" />
     <Compile Include="SpacingRules\SA1018CodeFixProvider.cs" />
     <Compile Include="SpacingRules\SA1018NullableTypeSymbolsMustNotBePrecededBySpace.cs" />
     <Compile Include="SpacingRules\SA1019MemberAccessSymbolsMustBeSpacedCorrectly.cs" />

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ class ClassName2`
`100`	`100`	`{`
`101`	`101`	`}`
`102`	`102`
`103`		`-[System.Obsolete/comment/]`
	`103`	`+[System.Obsolete /comment/]`
`104`	`104`	`class ClassNam3`
`105`	`105`	`{`
`106`	`106`	`}`
`@@ -170,7 +170,7 @@ protected override IEnumerable<DiagnosticAnalyzer> GetCSharpDiagnosticAnalyzers(`
`170`	`170`	`/// <inheritdoc/>`
`171`	`171`	`protected override CodeFixProvider GetCSharpCodeFixProvider()`
`172`	`172`	`{`
`173`		`- return new SA1017CodeFixProvider();`
	`173`	`+ return new OpenCloseSpacingCodeFixProvider();`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ private static void HandleCloseBracketToken(SyntaxTreeAnalysisContext context, S`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`// Closing attribute brackets must not be preceded by a space.`
`106`		`- context.ReportDiagnostic(Diagnostic.Create(Descriptor, token.GetLocation()));`
	`106`	`+ context.ReportDiagnostic(Diagnostic.Create(Descriptor, token.GetLocation(), OpenCloseSpacingCodeFixProvider.RemoveImmediatePreceding));`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`	`}`