Merge pull request #1782 from filipw/bugfix/disable-references

Fixed disabling of code lens references

Author: DustinCampbell

package.json

@@ -326,7 +326,12 @@
         "csharp.showReferencesCodeLens": {
           "type": "boolean",
           "default": true,
-          "description": "Specifies whether the references CodeLens show be shown."
+          "description": "Specifies whether the references CodeLens should be show be shown."
+        },
+        "csharp.showTestsCodeLens": {
+          "type": "boolean",
+          "default": true,
+          "description": "Specifies whether the run and debug test CodeLens should be show be shown."
         },
         "omnisharp.path": {
           "type": [

src/features/codeLensProvider.ts

@@ -28,12 +28,21 @@ class OmniSharpCodeLens extends vscode.CodeLens {
 export default class OmniSharpCodeLensProvider extends AbstractProvider implements vscode.CodeLensProvider {
 
     private _testManager: TestManager;
+    private _options: Options;
 
     constructor(server: OmniSharpServer, reporter: TelemetryReporter, testManager: TestManager)
     {
         super(server, reporter);
 
         this._testManager = testManager;
+        this._checkOptions();
+
+        let configChangedDisposable = vscode.workspace.onDidChangeConfiguration(this._checkOptions, this);
+        this.addDisposables(configChangedDisposable);
+    }
+
+    private _checkOptions(): void {
+        this._options = Options.Read();
     }
 
     private static filteredSymbolNames: { [name: string]: boolean } = {
@@ -44,8 +53,7 @@ export default class OmniSharpCodeLensProvider extends AbstractProvider implemen
     };
 
     provideCodeLenses(document: vscode.TextDocument, token: vscode.CancellationToken): vscode.CodeLens[] | Thenable<vscode.CodeLens[]> {
-        const options = Options.Read();
-        if (!options.showReferencesCodeLens)
+        if (!this._options.showReferencesCodeLens && !this._options.showTestsCodeLens)
         {
             return [];
         }
@@ -64,13 +72,17 @@ export default class OmniSharpCodeLensProvider extends AbstractProvider implemen
         }
 
         let lens = new OmniSharpCodeLens(fileName, toRange(node.Location));
-        bucket.push(lens);
+        if (this._options.showReferencesCodeLens) {
+            bucket.push(lens);
+        }
 
         for (let child of node.ChildNodes) {
             this._convertQuickFix(bucket, fileName, child);
         }
 
-        this._updateCodeLensForTest(bucket, fileName, node);
+        if (this._options.showTestsCodeLens) {
+            this._updateCodeLensForTest(bucket, fileName, node);
+        }
     }
 
     resolveCodeLens(codeLens: vscode.CodeLens, token: vscode.CancellationToken): Thenable<vscode.CodeLens> {

src/omnisharp/options.ts

@@ -16,7 +16,8 @@ export class Options {
         public maxProjectResults?: number,
         public useEditorFormattingSettings?: boolean,
         public useFormatting?: boolean,
-        public showReferencesCodeLens?: boolean) { }
+        public showReferencesCodeLens?: boolean,
+        public showTestsCodeLens?: boolean) { }
 
     public static Read(): Options {
         // Extra effort is taken below to ensure that legacy versions of options
@@ -53,6 +54,7 @@ export class Options {
         const useFormatting = csharpConfig.get<boolean>('format.enable', true);
 
         const showReferencesCodeLens = csharpConfig.get<boolean>('showReferencesCodeLens', true);
+        const showTestsCodeLens = csharpConfig.get<boolean>('showTestsCodeLens', true);
 
         return new Options(path, 
             useMono, 
@@ -63,6 +65,7 @@ export class Options {
             maxProjectResults, 
             useEditorFormattingSettings, 
             useFormatting,
-            showReferencesCodeLens);
+            showReferencesCodeLens,
+            showTestsCodeLens);
     }
 }