Merge pull request #1786 from DustinCampbell/option-caching-consistency

Make option caching consistent between providers

Author: DustinCampbell

src/features/codeActionProvider.ts

@@ -11,32 +11,32 @@ import AbstractProvider from './abstractProvider';
 import * as protocol from '../omnisharp/protocol';
 import { toRange2 } from '../omnisharp/typeConvertion';
 import * as serverUtils from '../omnisharp/utils';
+import { Options } from '../omnisharp/options';
 import TelemetryReporter from 'vscode-extension-telemetry';
 
 export default class CodeActionProvider extends AbstractProvider implements vscode.CodeActionProvider {
 
-    private _disabled: boolean;
+    private _options: Options;
     private _commandId: string;
 
     constructor(server: OmniSharpServer, reporter: TelemetryReporter) {
         super(server, reporter);
 
         this._commandId = 'omnisharp.runCodeAction';
 
-        this._checkOption();
+        this._resetCachedOptions();
 
-        let d1 = vscode.workspace.onDidChangeConfiguration(this._checkOption, this);
+        let d1 = vscode.workspace.onDidChangeConfiguration(this._resetCachedOptions, this);
         let d2 = vscode.commands.registerCommand(this._commandId, this._runCodeAction, this);
         this.addDisposables(d1, d2);
     }
 
-    private _checkOption(): void {
-        let value = vscode.workspace.getConfiguration().get('csharp.disableCodeActions', false);
-        this._disabled = value;
+    private _resetCachedOptions(): void {
+        this._options = Options.Read();
     }
 
     public provideCodeActions(document: vscode.TextDocument, range: vscode.Range, context: vscode.CodeActionContext, token: vscode.CancellationToken): Promise<vscode.Command[]> {
-        if (this._disabled) {
+        if (this._options.disableCodeActions) {
             return;
         }
 

src/features/codeLensProvider.ts

@@ -35,13 +35,13 @@ export default class OmniSharpCodeLensProvider extends AbstractProvider implemen
         super(server, reporter);
 
         this._testManager = testManager;
-        this._checkOptions();
+        this._resetCachedOptions();
 
-        let configChangedDisposable = vscode.workspace.onDidChangeConfiguration(this._checkOptions, this);
+        let configChangedDisposable = vscode.workspace.onDidChangeConfiguration(this._resetCachedOptions, this);
         this.addDisposables(configChangedDisposable);
     }
 
-    private _checkOptions(): void {
+    private _resetCachedOptions(): void {
         this._options = Options.Read();
     }
 

src/omnisharp/options.ts

@@ -17,7 +17,8 @@ export class Options {
         public useEditorFormattingSettings?: boolean,
         public useFormatting?: boolean,
         public showReferencesCodeLens?: boolean,
-        public showTestsCodeLens?: boolean) { }
+        public showTestsCodeLens?: boolean,
+        public disableCodeActions?: boolean) { }
 
     public static Read(): Options {
         // Extra effort is taken below to ensure that legacy versions of options
@@ -56,6 +57,8 @@ export class Options {
         const showReferencesCodeLens = csharpConfig.get<boolean>('showReferencesCodeLens', true);
         const showTestsCodeLens = csharpConfig.get<boolean>('showTestsCodeLens', true);
 
+        const disableCodeActions = csharpConfig.get<boolean>('disableCodeActions', false);
+
         return new Options(path, 
             useMono, 
             waitForDebugger,
@@ -66,6 +69,7 @@ export class Options {
             useEditorFormattingSettings, 
             useFormatting,
             showReferencesCodeLens,
-            showTestsCodeLens);
+            showTestsCodeLens,
+            disableCodeActions);
     }
 }