Skip to content

Commit 6f183c8

Browse files
committed
Address feedback
1 parent fb76b9f commit 6f183c8

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

src/features/diagnosticsProvider.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,14 +135,16 @@ class OmniSharpDiagnosticsProvider extends AbstractSupport {
135135
) {
136136
super(server, languageMiddlewareFeature);
137137

138+
const analyzersEnabledLegacyOption = vscode.workspace.getConfiguration('omnisharp').get('enableRoslynAnalyzers', false);
138139
const useOmnisharpServer = vscode.workspace.getConfiguration('dotnet').get('server.useOmnisharp', false);
139-
this._analyzersEnabled =
140+
const analyzersEnabledNewOption =
140141
vscode.workspace
141142
.getConfiguration('dotnet')
142143
.get<string>(
143144
'backgroundAnalysis.analyzerDiagnosticsScope',
144145
useOmnisharpServer ? 'none' : 'openFiles'
145146
) != 'none';
147+
this._analyzersEnabled = analyzersEnabledLegacyOption || analyzersEnabledNewOption;
146148
this._validationAdvisor = validationAdvisor;
147149
this._diagnostics = vscode.languages.createDiagnosticCollection('csharp');
148150
this._suppressHiddenDiagnostics = vscode.workspace

src/shared/options.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,14 @@ export class Options {
119119
'omnisharp.useEditorFormattingSettings',
120120
true
121121
);
122+
const enableRoslynAnalyzersLegacyOption = Options.readOption<boolean>(config, 'omnisharp.enableRoslynAnalyzers', false);
122123
const diagnosticAnalysisScope = Options.readOption<string>(
123124
config,
124125
'dotnet.backgroundAnalysis.analyzerDiagnosticsScope',
125126
useOmnisharpServer ? 'none' : 'openFiles'
126127
);
127-
const enableRoslynAnalyzers = diagnosticAnalysisScope != 'none';
128+
const enableRoslynAnalyzersNewOption = diagnosticAnalysisScope != 'none';
129+
const enableRoslynAnalyzers = enableRoslynAnalyzersLegacyOption || enableRoslynAnalyzersNewOption;
128130
const enableEditorConfigSupport = Options.readOption<boolean>(
129131
config,
130132
'omnisharp.enableEditorConfigSupport',
@@ -143,7 +145,13 @@ export class Options {
143145
'omnisharp.enableImportCompletion'
144146
);
145147
const enableAsyncCompletion = Options.readOption<boolean>(config, 'omnisharp.enableAsyncCompletion', false);
146-
const analyzeOpenDocumentsOnly = diagnosticAnalysisScope == 'openFiles';
148+
const analyzeOpenDocumentsOnlyLegacyOption = Options.readOption<boolean>(
149+
config,
150+
'omnisharp.analyzeOpenDocumentsOnly',
151+
false
152+
);
153+
const analyzeOpenDocumentsOnlyNewOption = diagnosticAnalysisScope == 'openFiles';
154+
const analyzeOpenDocumentsOnly = analyzeOpenDocumentsOnlyLegacyOption || analyzeOpenDocumentsOnlyNewOption;
147155
const organizeImportsOnFormat = Options.readOption<boolean>(config, 'omnisharp.organizeImportsOnFormat', false);
148156
const disableMSBuildDiagnosticWarning = Options.readOption<boolean>(
149157
config,

0 commit comments

Comments
 (0)