Skip to content

Commit f437839

Browse files
JoeRobichJoeRobich
committed
Get Option values from AnalyzerOptions directly
1 parent eb44920 commit f437839

File tree

38 files changed

+103
-95
lines changed

38 files changed

+103
-95
lines changed

‎src/EditorFeatures/TestUtilities/Workspaces/TestWorkspace_XmlConsumption.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,7 @@ private static TestHostProject CreateProject(
278278
}
279279
else
280280
{
281-
// Prepend "./" because DocumentState expects the project to be within a directory when getting AnalyzerOptions.
282-
filePath = "./" + projectName +
281+
filePath = projectName +
283282
(language == LanguageNames.CSharp ? ".csproj" :
284283
language == LanguageNames.VisualBasic ? ".vbproj" : ("." + language));
285284
}

‎src/Features/CSharp/Portable/AddBraces/CSharpAddBracesDiagnosticAnalyzer.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ public void AnalyzeNode(SyntaxNodeAnalysisContext context)
4545
var statement = context.Node;
4646
var cancellationToken = context.CancellationToken;
4747

48-
var optionSet = context.Options.GetAnalyzerOptionSetAsync(statement.SyntaxTree, cancellationToken).GetAwaiter().GetResult();
49-
var option = optionSet.GetOption(CSharpCodeStyleOptions.PreferBraces);
48+
var option = context.Options.GetOptionAsync(
49+
CSharpCodeStyleOptions.PreferBraces, statement.SyntaxTree, cancellationToken).GetAwaiter().GetResult();
5050
if (option.Value == PreferBracesPreference.None)
5151
{
5252
return;

‎src/Features/CSharp/Portable/ConvertSwitchStatementToExpression/ConvertSwitchStatementToExpressionDiagnosticAnalyzer.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,8 @@ private void AnalyzeSyntax(SyntaxNodeAnalysisContext context)
4545

4646
var options = context.Options;
4747
var cancellationToken = context.CancellationToken;
48-
var optionSet = options.GetAnalyzerOptionSetAsync(syntaxTree, cancellationToken).GetAwaiter().GetResult();
4948

50-
var styleOption = optionSet.GetOption(CSharpCodeStyleOptions.PreferSwitchExpression);
49+
var styleOption = options.GetOptionAsync(CSharpCodeStyleOptions.PreferSwitchExpression, syntaxTree, cancellationToken).GetAwaiter().GetResult();
5150
if (!styleOption.Value)
5251
{
5352
// User has disabled this feature.

‎src/Features/CSharp/Portable/InlineDeclaration/CSharpInlineDeclarationDiagnosticAnalyzer.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ private void AnalyzeSyntaxNode(SyntaxNodeAnalysisContext context, INamedTypeSymb
6767
var syntaxTree = context.Node.SyntaxTree;
6868
var cancellationToken = context.CancellationToken;
6969

70-
var optionSet = options.GetAnalyzerOptionSetAsync(syntaxTree, cancellationToken).GetAwaiter().GetResult();
71-
var option = optionSet.GetOption(CSharpCodeStyleOptions.PreferInlinedVariableDeclaration);
70+
var option = options.GetOptionAsync(CSharpCodeStyleOptions.PreferInlinedVariableDeclaration, syntaxTree, cancellationToken).GetAwaiter().GetResult();
7271
if (!option.Value)
7372
{
7473
// Don't bother doing any work if the user doesn't even have this preference set.

‎src/Features/CSharp/Portable/InvokeDelegateWithConditionalAccess/InvokeDelegateWithConditionalAccessAnalyzer.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ private void SyntaxNodeAction(SyntaxNodeAnalysisContext syntaxContext)
3737
var syntaxTree = syntaxContext.Node.SyntaxTree;
3838
var cancellationToken = syntaxContext.CancellationToken;
3939

40-
var optionSet = options.GetAnalyzerOptionSetAsync(syntaxTree, cancellationToken).GetAwaiter().GetResult();
41-
var styleOption = optionSet.GetOption(CSharpCodeStyleOptions.PreferConditionalDelegateCall);
40+
var styleOption = options.GetOptionAsync(
41+
CSharpCodeStyleOptions.PreferConditionalDelegateCall, syntaxTree, cancellationToken).GetAwaiter().GetResult();
4242
if (!styleOption.Value)
4343
{
4444
// Bail immediately if the user has disabled this feature.

‎src/Features/CSharp/Portable/MakeLocalFunctionStatic/MakeLocalFunctionStaticDiagnosticAnalyzer.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ private void AnalyzeSyntax(SyntaxNodeAnalysisContext context)
4141
}
4242

4343
var cancellationToken = context.CancellationToken;
44-
var optionSet = context.Options.GetAnalyzerOptionSetAsync(syntaxTree, cancellationToken).GetAwaiter().GetResult();
45-
var option = optionSet.GetOption(CSharpCodeStyleOptions.PreferStaticLocalFunction);
44+
var option = context.Options.GetOptionAsync(
45+
CSharpCodeStyleOptions.PreferStaticLocalFunction, syntaxTree, cancellationToken).GetAwaiter().GetResult();
4646
if (!option.Value)
4747
{
4848
return;

‎src/Features/CSharp/Portable/MisplacedUsingDirectives/MisplacedUsingDirectivesDiagnosticAnalyzer.cs‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ protected override void InitializeWorker(AnalysisContext context)
5151

5252
private void AnalyzeNamespaceNode(SyntaxNodeAnalysisContext context)
5353
{
54-
var option = GetPreferredPlacementOptionAsync(context).GetAwaiter().GetResult();
54+
var option = context.Options.GetOptionAsync(
55+
CSharpCodeStyleOptions.PreferredUsingDirectivePlacement, context.Node.SyntaxTree, context.CancellationToken).GetAwaiter().GetResult();
5556
if (option.Value != AddImportPlacement.OutsideNamespace)
5657
{
5758
return;
@@ -63,7 +64,8 @@ private void AnalyzeNamespaceNode(SyntaxNodeAnalysisContext context)
6364

6465
private static void AnalyzeCompilationUnitNode(SyntaxNodeAnalysisContext context)
6566
{
66-
var option = GetPreferredPlacementOptionAsync(context).GetAwaiter().GetResult();
67+
var option = context.Options.GetOptionAsync(
68+
CSharpCodeStyleOptions.PreferredUsingDirectivePlacement, context.Node.SyntaxTree, context.CancellationToken).GetAwaiter().GetResult();
6769
var compilationUnit = (CompilationUnitSyntax)context.Node;
6870

6971
if (option.Value != AddImportPlacement.InsideNamespace
@@ -85,12 +87,6 @@ private static bool ShouldSuppressDiagnostic(CompilationUnitSyntax compilationUn
8587
t => !t.IsKind(SyntaxKind.UsingDirective, SyntaxKind.NamespaceDeclaration));
8688
}
8789

88-
private static async Task<CodeStyleOption<AddImportPlacement>> GetPreferredPlacementOptionAsync(SyntaxNodeAnalysisContext context)
89-
{
90-
var options = await context.Options.GetAnalyzerOptionSetAsync(context.Node.SyntaxTree, context.CancellationToken);
91-
return options.GetOption(CSharpCodeStyleOptions.PreferredUsingDirectivePlacement);
92-
}
93-
9490
private static void ReportDiagnostics(
9591
SyntaxNodeAnalysisContext context, DiagnosticDescriptor descriptor,
9692
IEnumerable<UsingDirectiveSyntax> usingDirectives, CodeStyleOption<AddImportPlacement> option)

‎src/Features/CSharp/Portable/UseDeconstruction/CSharpUseDeconstructionDiagnosticAnalyzer.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ protected override void InitializeWorker(AnalysisContext context)
4040
private void AnalyzeNode(SyntaxNodeAnalysisContext context)
4141
{
4242
var cancellationToken = context.CancellationToken;
43-
var optionSet = context.Options.GetAnalyzerOptionSetAsync(context.Node.SyntaxTree, cancellationToken).GetAwaiter().GetResult();
44-
var option = optionSet.GetOption(CSharpCodeStyleOptions.PreferDeconstructedVariableDeclaration);
43+
var option = context.Options.GetOptionAsync(
44+
CSharpCodeStyleOptions.PreferDeconstructedVariableDeclaration, context.Node.SyntaxTree, cancellationToken).GetAwaiter().GetResult();
4545
if (!option.Value)
4646
{
4747
return;

‎src/Features/CSharp/Portable/UseIndexOrRangeOperator/CSharpUseIndexOperatorDiagnosticAnalyzer.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,8 @@ private void AnalyzeInvokedMember(
185185
}
186186

187187
// Don't bother analyzing if the user doesn't like using Index/Range operators.
188-
var optionSet = context.Options.GetAnalyzerOptionSetAsync(syntaxTree, cancellationToken).GetAwaiter().GetResult();
189-
var option = optionSet.GetOption(CSharpCodeStyleOptions.PreferIndexOperator);
188+
var option = context.Options.GetOptionAsync(
189+
CSharpCodeStyleOptions.PreferIndexOperator, syntaxTree, cancellationToken).GetAwaiter().GetResult();
190190
if (!option.Value)
191191
{
192192
return;

‎src/Features/CSharp/Portable/UseIndexOrRangeOperator/CSharpUseRangeOperatorDiagnosticAnalyzer.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ private void AnalyzeInvocation(
100100
return default;
101101
}
102102

103-
var optionSet = analyzerOptionsOpt.GetAnalyzerOptionSetAsync(syntaxTree, cancellationToken).GetAwaiter().GetResult();
104-
option = optionSet.GetOption(CSharpCodeStyleOptions.PreferRangeOperator);
103+
option = analyzerOptionsOpt.GetOptionAsync(
104+
CSharpCodeStyleOptions.PreferRangeOperator, syntaxTree, cancellationToken).GetAwaiter().GetResult();
105105
if (!option.Value)
106106
{
107107
return default;

0 commit comments

Comments
 (0)