Skip to content

Commit 602874e

Browse files
vweijstersvweijsters
committed
Removed unnecessary diagnostic id checks
1 parent 5a61cdf commit 602874e

66 files changed

Lines changed: 55 additions & 187 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1513UnitTests.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,7 @@ public void Example()
548548
public async Task TestCodeFixAsync()
549549
{
550550
var testCode = @"using System;
551+
using System.Collections.Generic;
551552
552553
public class Foo
553554
{
@@ -623,6 +624,7 @@ public void Example()
623624
";
624625

625626
var fixedTestCode = @"using System;
627+
using System.Collections.Generic;
626628
627629
public class Foo
628630
{

‎StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/CodeFixVerifier.cs‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,12 @@ private static async Task<Document> GetSingleAnalyzerDocumentAsync(ImmutableArra
163163
done = true;
164164
for (var i = 0; i < analyzerDiagnostics.Length; i++)
165165
{
166+
if (!codeFixProvider.FixableDiagnosticIds.Contains(analyzerDiagnostics[i].Id))
167+
{
168+
// do not pass unsupported diagnostics to a code fix provider
169+
continue;
170+
}
171+
166172
var actions = new List<CodeAction>();
167173
var context = new CodeFixContext(document, analyzerDiagnostics[i], (a, d) => actions.Add(a), cancellationToken);
168174
await codeFixProvider.RegisterCodeFixesAsync(context).ConfigureAwait(false);
@@ -235,6 +241,12 @@ private static async Task<Document> GetFixAllAnalyzerAsync(FixAllScope scope, Im
235241
string equivalenceKey = null;
236242
foreach (var diagnostic in analyzerDiagnostics)
237243
{
244+
if (!codeFixProvider.FixableDiagnosticIds.Contains(diagnostic.Id))
245+
{
246+
// do not pass unsupported diagnostics to a code fix provider
247+
continue;
248+
}
249+
238250
var actions = new List<CodeAction>();
239251
var context = new CodeFixContext(document, diagnostic, (a, d) => actions.Add(a), cancellationToken);
240252
await codeFixProvider.RegisterCodeFixesAsync(context).ConfigureAwait(false);
@@ -342,8 +354,13 @@ private async Task<ImmutableArray<CodeAction>> GetOfferedFixesInternalAsync(stri
342354
Assert.True(index < analyzerDiagnostics.Count());
343355

344356
var actions = new List<CodeAction>();
345-
var context = new CodeFixContext(document, analyzerDiagnostics[index], (a, d) => actions.Add(a), cancellationToken);
346-
await codeFixProvider.RegisterCodeFixesAsync(context).ConfigureAwait(false);
357+
358+
// do not pass unsupported diagnostics to a code fix provider
359+
if (codeFixProvider.FixableDiagnosticIds.Contains(analyzerDiagnostics[index].Id))
360+
{
361+
var context = new CodeFixContext(document, analyzerDiagnostics[index], (a, d) => actions.Add(a), cancellationToken);
362+
await codeFixProvider.RegisterCodeFixesAsync(context).ConfigureAwait(false);
363+
}
347364

348365
return actions.ToImmutableArray();
349366
}

‎StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/FileHeaderCodeFixProvider.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public override FixAllProvider GetFixAllProvider()
5050
/// <inheritdoc/>
5151
public override Task RegisterCodeFixesAsync(CodeFixContext context)
5252
{
53-
foreach (Diagnostic diagnostic in context.Diagnostics.Where(d => this.FixableDiagnosticIds.Contains(d.Id)))
53+
foreach (Diagnostic diagnostic in context.Diagnostics)
5454
{
5555
context.RegisterCodeFix(CodeAction.Create(DocumentationResources.SA1633CodeFix, token => GetTransformedDocumentAsync(context.Document, token), equivalenceKey: nameof(FileHeaderCodeFixProvider)), diagnostic);
5656
}

‎StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/InheritdocCodeFixProvider.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
4242
SyntaxNode root = await context.Document.GetSyntaxRootAsync(context.CancellationToken).ConfigureAwait(false);
4343
foreach (var diagnostic in context.Diagnostics)
4444
{
45-
if (!this.FixableDiagnosticIds.Contains(diagnostic.Id))
46-
{
47-
continue;
48-
}
49-
5045
SyntaxToken identifierToken = root.FindToken(diagnostic.Location.SourceSpan.Start);
5146
if (identifierToken.IsMissingOrDefault())
5247
{

‎StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1609SA1610CodeFixProvider.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,6 @@ public override Task RegisterCodeFixesAsync(CodeFixContext context)
4747
{
4848
foreach (var diagnostic in context.Diagnostics)
4949
{
50-
if (!FixableDiagnostics.Contains(diagnostic.Id, StringComparer.Ordinal))
51-
{
52-
continue;
53-
}
54-
5550
string description = DocumentationResources.SA1609SA1610CodeFix;
5651
context.RegisterCodeFix(CodeAction.Create(description, cancellationToken => this.GetTransformedDocumentAsync(context.Document, diagnostic, cancellationToken), equivalenceKey: nameof(SA1609SA1610CodeFixProvider)), diagnostic);
5752
}

‎StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1615SA1616CodeFixProvider.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,6 @@ public override Task RegisterCodeFixesAsync(CodeFixContext context)
4747
{
4848
foreach (var diagnostic in context.Diagnostics)
4949
{
50-
if (!FixableDiagnostics.Contains(diagnostic.Id, StringComparer.Ordinal))
51-
{
52-
continue;
53-
}
54-
5550
string description = "Document return value";
5651
context.RegisterCodeFix(CodeAction.Create(description, cancellationToken => GetTransformedDocumentAsync(context.Document, diagnostic, cancellationToken), equivalenceKey: nameof(SA1615SA1616CodeFixProvider)), diagnostic);
5752
}

‎StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1617CodeFixProvider.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public override FixAllProvider GetFixAllProvider()
4040
/// <inheritdoc/>
4141
public override Task RegisterCodeFixesAsync(CodeFixContext context)
4242
{
43-
foreach (Diagnostic diagnostic in context.Diagnostics.Where(d => FixableDiagnostics.Contains(d.Id)))
43+
foreach (Diagnostic diagnostic in context.Diagnostics)
4444
{
4545
context.RegisterCodeFix(CodeAction.Create(DocumentationResources.SA1617CodeFix, token => GetTransformedDocumentAsync(context.Document, diagnostic, token), equivalenceKey: nameof(SA1617CodeFixProvider)), diagnostic);
4646
}

‎StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1626CodeFixProvider.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ public override Task RegisterCodeFixesAsync(CodeFixContext context)
4040
{
4141
foreach (Diagnostic diagnostic in context.Diagnostics)
4242
{
43-
if (diagnostic.Id != SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes.DiagnosticId)
44-
{
45-
continue;
46-
}
47-
4843
context.RegisterCodeFix(
4944
CodeAction.Create(
5045
DocumentationResources.SA1626CodeFix,

‎StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1642SA1643CodeFixProvider.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,6 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
4949

5050
foreach (var diagnostic in context.Diagnostics)
5151
{
52-
if (!FixableDiagnostics.Contains(diagnostic.Id))
53-
{
54-
continue;
55-
}
56-
5752
var node = root.FindNode(diagnostic.Location.SourceSpan, findInsideTrivia: true, getInnermostNodeForTie: true);
5853

5954
var xmlElementSyntax = node as XmlElementSyntax;

‎StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1651CodeFixProvider.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
4343
{
4444
foreach (var diagnostic in context.Diagnostics)
4545
{
46-
if (!FixableDiagnostics.Contains(diagnostic.Id, StringComparer.Ordinal))
47-
{
48-
continue;
49-
}
50-
5146
var documentRoot = await context.Document.GetSyntaxRootAsync(context.CancellationToken).ConfigureAwait(false);
5247
SyntaxNode syntax = documentRoot.FindNode(diagnostic.Location.SourceSpan, findInsideTrivia: true, getInnermostNodeForTie: true);
5348
if (syntax == null)

0 commit comments

Comments
 (0)