Skip to content

Commit 490140c

Browse files
sharwellsharwell
committed
Use RegisterSyntaxTreeAction instead of RegisterSyntaxTreeActionHonorExclusions
1 parent 27b7396 commit 490140c

29 files changed

Lines changed: 60 additions & 172 deletions

File tree

‎StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1509OpeningBracesMustNotBePrecededByBlankLine.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ internal class SA1509OpeningBracesMustNotBePrecededByBlankLine : DiagnosticAnaly
5353
private static readonly DiagnosticDescriptor Descriptor =
5454
new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.LayoutRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink);
5555

56-
private static readonly Action<CompilationStartAnalysisContext> CompilationStartAction = HandleCompilationStart;
5756
private static readonly Action<SyntaxTreeAnalysisContext> SyntaxTreeAction = HandleSyntaxTree;
5857

5958
/// <inheritdoc/>
@@ -63,12 +62,9 @@ internal class SA1509OpeningBracesMustNotBePrecededByBlankLine : DiagnosticAnaly
6362
/// <inheritdoc/>
6463
public override void Initialize(AnalysisContext context)
6564
{
66-
context.RegisterCompilationStartAction(CompilationStartAction);
67-
}
65+
context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
6866

69-
private static void HandleCompilationStart(CompilationStartAnalysisContext context)
70-
{
71-
context.RegisterSyntaxTreeActionHonorExclusions(SyntaxTreeAction);
67+
context.RegisterSyntaxTreeAction(SyntaxTreeAction);
7268
}
7369

7470
private static void HandleSyntaxTree(SyntaxTreeAnalysisContext context)

‎StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1512SingleLineCommentsMustNotBeFollowedByBlankLine.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,15 @@ internal class SA1512SingleLineCommentsMustNotBeFollowedByBlankLine : Diagnostic
9595
/// <inheritdoc/>
9696
public override void Initialize(AnalysisContext context)
9797
{
98+
context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
99+
98100
context.RegisterCompilationStartAction(CompilationStartAction);
99101
}
100102

101103
private static void HandleCompilationStart(CompilationStartAnalysisContext context)
102104
{
103105
var diagnosticOptions = context.Compilation.Options.SpecificDiagnosticOptions;
104-
context.RegisterSyntaxTreeActionHonorExclusions(c => HandleSyntaxTreeAnalysis(c, diagnosticOptions));
106+
context.RegisterSyntaxTreeAction(c => HandleSyntaxTreeAnalysis(c, diagnosticOptions));
105107
}
106108

107109
private static void HandleSyntaxTreeAnalysis(SyntaxTreeAnalysisContext context, ImmutableDictionary<string, ReportDiagnostic> specificDiagnosticOptions)

‎StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1513ClosingBraceMustBeFollowedByBlankLine.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ internal class SA1513ClosingBraceMustBeFollowedByBlankLine : DiagnosticAnalyzer
5252
private static readonly DiagnosticDescriptor Descriptor =
5353
new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.LayoutRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink);
5454

55-
private static readonly Action<CompilationStartAnalysisContext> CompilationStartAction = HandleCompilationStart;
5655
private static readonly Action<SyntaxTreeAnalysisContext> SyntaxTreeAction = HandleSyntaxTree;
5756

5857
/// <inheritdoc/>
@@ -62,12 +61,9 @@ internal class SA1513ClosingBraceMustBeFollowedByBlankLine : DiagnosticAnalyzer
6261
/// <inheritdoc/>
6362
public override void Initialize(AnalysisContext context)
6463
{
65-
context.RegisterCompilationStartAction(CompilationStartAction);
66-
}
64+
context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
6765

68-
private static void HandleCompilationStart(CompilationStartAnalysisContext context)
69-
{
70-
context.RegisterSyntaxTreeActionHonorExclusions(SyntaxTreeAction);
66+
context.RegisterSyntaxTreeAction(SyntaxTreeAction);
7167
}
7268

7369
private static void HandleSyntaxTree(SyntaxTreeAnalysisContext context)

‎StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1515SingleLineCommentMustBePrecededByBlankLine.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ internal class SA1515SingleLineCommentMustBePrecededByBlankLine : DiagnosticAnal
8787
private static readonly DiagnosticDescriptor Descriptor =
8888
new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.LayoutRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink);
8989

90-
private static readonly Action<CompilationStartAnalysisContext> CompilationStartAction = HandleCompilationStart;
9190
private static readonly Action<SyntaxTreeAnalysisContext> SyntaxTreeAction = HandleSyntaxTree;
9291

9392
/// <inheritdoc/>
@@ -97,12 +96,9 @@ internal class SA1515SingleLineCommentMustBePrecededByBlankLine : DiagnosticAnal
9796
/// <inheritdoc/>
9897
public override void Initialize(AnalysisContext context)
9998
{
100-
context.RegisterCompilationStartAction(CompilationStartAction);
101-
}
99+
context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
102100

103-
private static void HandleCompilationStart(CompilationStartAnalysisContext context)
104-
{
105-
context.RegisterSyntaxTreeActionHonorExclusions(SyntaxTreeAction);
101+
context.RegisterSyntaxTreeAction(SyntaxTreeAction);
106102
}
107103

108104
private static void HandleSyntaxTree(SyntaxTreeAnalysisContext context)

‎StyleCop.Analyzers/StyleCop.Analyzers/MaintainabilityRules/SA1403FileMayOnlyContainASingleNamespace.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ internal class SA1403FileMayOnlyContainASingleNamespace : DiagnosticAnalyzer
3232
private static readonly DiagnosticDescriptor Descriptor =
3333
new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.MaintainabilityRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink);
3434

35-
private static readonly Action<CompilationStartAnalysisContext> CompilationStartAction = HandleCompilationStart;
3635
private static readonly Action<SyntaxTreeAnalysisContext> SyntaxTreeAction = HandleSyntaxTree;
3736

3837
/// <inheritdoc/>
@@ -42,12 +41,9 @@ internal class SA1403FileMayOnlyContainASingleNamespace : DiagnosticAnalyzer
4241
/// <inheritdoc/>
4342
public override void Initialize(AnalysisContext context)
4443
{
45-
context.RegisterCompilationStartAction(CompilationStartAction);
46-
}
44+
context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
4745

48-
private static void HandleCompilationStart(CompilationStartAnalysisContext context)
49-
{
50-
context.RegisterSyntaxTreeActionHonorExclusions(SyntaxTreeAction);
46+
context.RegisterSyntaxTreeAction(SyntaxTreeAction);
5147
}
5248

5349
private static void HandleSyntaxTree(SyntaxTreeAnalysisContext context)

‎StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1120CommentsMustContainText.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ internal class SA1120CommentsMustContainText : DiagnosticAnalyzer
3333
private static readonly DiagnosticDescriptor Descriptor =
3434
new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.ReadabilityRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink);
3535

36-
private static readonly Action<CompilationStartAnalysisContext> CompilationStartAction = HandleCompilationStart;
3736
private static readonly Action<SyntaxTreeAnalysisContext> SyntaxTreeAction = HandleSyntaxTree;
3837

3938
/// <inheritdoc/>
@@ -43,12 +42,9 @@ internal class SA1120CommentsMustContainText : DiagnosticAnalyzer
4342
/// <inheritdoc/>
4443
public override void Initialize(AnalysisContext context)
4544
{
46-
context.RegisterCompilationStartAction(CompilationStartAction);
47-
}
45+
context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
4846

49-
private static void HandleCompilationStart(CompilationStartAnalysisContext context)
50-
{
51-
context.RegisterSyntaxTreeActionHonorExclusions(SyntaxTreeAction);
47+
context.RegisterSyntaxTreeAction(SyntaxTreeAction);
5248
}
5349

5450
private static void HandleSyntaxTree(SyntaxTreeAnalysisContext context)

‎StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1000KeywordsMustBeSpacedCorrectly.cs‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ internal class SA1000KeywordsMustBeSpacedCorrectly : DiagnosticAnalyzer
4444
private static readonly DiagnosticDescriptor Descriptor =
4545
new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.SpacingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink);
4646

47-
private static readonly Action<CompilationStartAnalysisContext> CompilationStartAction = HandleCompilationStart;
4847
private static readonly Action<SyntaxTreeAnalysisContext> SyntaxTreeAction = HandleSyntaxTree;
4948
private static readonly Action<SyntaxNodeAnalysisContext> InvocationExpressionAction = HandleInvocationExpression;
5049

@@ -57,16 +56,11 @@ public override void Initialize(AnalysisContext context)
5756
{
5857
context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
5958

59+
// handle everything except nameof
60+
context.RegisterSyntaxTreeAction(SyntaxTreeAction);
61+
6062
// handle nameof (which appears as an invocation expression??)
6163
context.RegisterSyntaxNodeAction(InvocationExpressionAction, SyntaxKind.InvocationExpression);
62-
63-
context.RegisterCompilationStartAction(CompilationStartAction);
64-
}
65-
66-
private static void HandleCompilationStart(CompilationStartAnalysisContext context)
67-
{
68-
// handle everything except nameof
69-
context.RegisterSyntaxTreeActionHonorExclusions(SyntaxTreeAction);
7064
}
7165

7266
private static void HandleSyntaxTree(SyntaxTreeAnalysisContext context)

‎StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1001CommasMustBeSpacedCorrectly.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ internal class SA1001CommasMustBeSpacedCorrectly : DiagnosticAnalyzer
3434
private static readonly DiagnosticDescriptor Descriptor =
3535
new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.SpacingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink);
3636

37-
private static readonly Action<CompilationStartAnalysisContext> CompilationStartAction = HandleCompilationStart;
3837
private static readonly Action<SyntaxTreeAnalysisContext> SyntaxTreeAction = HandleSyntaxTree;
3938

4039
/// <inheritdoc/>
@@ -44,12 +43,9 @@ internal class SA1001CommasMustBeSpacedCorrectly : DiagnosticAnalyzer
4443
/// <inheritdoc/>
4544
public override void Initialize(AnalysisContext context)
4645
{
47-
context.RegisterCompilationStartAction(CompilationStartAction);
48-
}
46+
context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
4947

50-
private static void HandleCompilationStart(CompilationStartAnalysisContext context)
51-
{
52-
context.RegisterSyntaxTreeActionHonorExclusions(SyntaxTreeAction);
48+
context.RegisterSyntaxTreeAction(SyntaxTreeAction);
5349
}
5450

5551
private static void HandleSyntaxTree(SyntaxTreeAnalysisContext context)

‎StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1002SemicolonsMustBeSpacedCorrectly.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ internal class SA1002SemicolonsMustBeSpacedCorrectly : DiagnosticAnalyzer
3434
private static readonly DiagnosticDescriptor Descriptor =
3535
new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.SpacingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink);
3636

37-
private static readonly Action<CompilationStartAnalysisContext> CompilationStartAction = HandleCompilationStart;
3837
private static readonly Action<SyntaxTreeAnalysisContext> SyntaxTreeAction = HandleSyntaxTree;
3938

4039
/// <inheritdoc/>
@@ -44,12 +43,9 @@ internal class SA1002SemicolonsMustBeSpacedCorrectly : DiagnosticAnalyzer
4443
/// <inheritdoc/>
4544
public override void Initialize(AnalysisContext context)
4645
{
47-
context.RegisterCompilationStartAction(CompilationStartAction);
48-
}
46+
context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
4947

50-
private static void HandleCompilationStart(CompilationStartAnalysisContext context)
51-
{
52-
context.RegisterSyntaxTreeActionHonorExclusions(SyntaxTreeAction);
48+
context.RegisterSyntaxTreeAction(SyntaxTreeAction);
5349
}
5450

5551
private static void HandleSyntaxTree(SyntaxTreeAnalysisContext context)

‎StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1004DocumentationLinesMustBeginWithSingleSpace.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ internal class SA1004DocumentationLinesMustBeginWithSingleSpace : DiagnosticAnal
5656
private static readonly DiagnosticDescriptor Descriptor =
5757
new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.SpacingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink);
5858

59-
private static readonly Action<CompilationStartAnalysisContext> CompilationStartAction = HandleCompilationStart;
6059
private static readonly Action<SyntaxTreeAnalysisContext> SyntaxTreeAction = HandleSyntaxTree;
6160

6261
/// <inheritdoc/>
@@ -66,12 +65,9 @@ internal class SA1004DocumentationLinesMustBeginWithSingleSpace : DiagnosticAnal
6665
/// <inheritdoc/>
6766
public override void Initialize(AnalysisContext context)
6867
{
69-
context.RegisterCompilationStartAction(CompilationStartAction);
70-
}
68+
context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
7169

72-
private static void HandleCompilationStart(CompilationStartAnalysisContext context)
73-
{
74-
context.RegisterSyntaxTreeActionHonorExclusions(SyntaxTreeAction);
70+
context.RegisterSyntaxTreeAction(SyntaxTreeAction);
7571
}
7672

7773
private static void HandleSyntaxTree(SyntaxTreeAnalysisContext context)

0 commit comments

Comments
 (0)