Merge branch 'master' into remove_vscode_disposable

Author: akshita31

CHANGELOG.md

@@ -35,6 +35,9 @@ Enables the use of pre-release builds of Omnisharp. Downloading a pre-release bu
     * If a project is already selected, it displays the name of the selected project. Clicking on it displays a menu to switch to other projects in the workspace. 
     * If there are multiple possible launch targets, it displays 'Select Project'. Clicking on it displays a menu to select one.
 
+#### Misc
+* Enables suppressing the "some projects had trouble loading" popup using the `omnisharp.disableMsBuildDiagnosticWarning` option ([#2110]https://github.com/OmniSharp/omnisharp-vscode/issues/2110)
+
 ## 1.14.0 (February 14, 2018)
 
 #### C# Language Support

package.json

@@ -560,6 +560,11 @@
           "type": "boolean",
           "default": true,
           "description": "Specifes whether OmniSharp should use VS Code editor settings for C# code formatting (use of tabs, indentation size)."
+        },
+        "omnisharp.disableMSBuildDiagnosticWarning": {
+          "type": "boolean",
+          "default": false,
+          "description": "Specifies whether notifications should be shown if OmniSharp encounters warnings or errors loading a project. Note that these warnings/errors are always emitted to the OmniSharp log"
         }
       }
     },

src/main.ts

@@ -28,6 +28,7 @@ import TelemetryReporter from 'vscode-extension-telemetry';
 import { addJSONProviders } from './features/json/jsonContributions';
 import { ProjectStatusBarObserver } from './observers/ProjectStatusBarObserver';
 import CSharpExtensionExports from './CSharpExtensionExports';
+import { Options } from './omnisharp/options';
 import { vscodeNetworkSettingsProvider, NetworkSettingsProvider } from './NetworkSettings';
 
 export async function activate(context: vscode.ExtensionContext): Promise<CSharpExtensionExports> {
@@ -60,7 +61,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<CSharp
     eventStream.subscribe(omnisharpLogObserver.post);
     eventStream.subscribe(omnisharpChannelObserver.post);
 
-    let warningMessageObserver = new WarningMessageObserver(vscode);
+    let warningMessageObserver = new WarningMessageObserver(vscode, () => Options.Read().disableMSBuildDiagnosticWarning || false);
     eventStream.subscribe(warningMessageObserver.post);
 
     let informationMessageObserver = new InformationMessageObserver(vscode);

src/observers/WarningMessageObserver.ts

@@ -16,7 +16,7 @@ export interface MessageItemWithCommand extends MessageItem {
 export class WarningMessageObserver {
     private warningMessageDebouncer: Subject<BaseEvent>;
 
-    constructor(private vscode: vscode, scheduler?: Scheduler) {
+    constructor(private vscode: vscode, private disableMsBuildDiagnosticWarning: () => boolean, scheduler?: Scheduler) {
         this.warningMessageDebouncer = new Subject<BaseEvent>();
         this.warningMessageDebouncer.debounceTime(1500, scheduler).subscribe(async event => {
             let message = "Some projects have trouble loading. Please review the output for more details.";
@@ -50,7 +50,7 @@ export class WarningMessageObserver {
     }
 
     private handleOmnisharpServerMsBuildProjectDiagnostics(event: OmnisharpServerMsBuildProjectDiagnostics) {
-        if (event.diagnostics.Errors.length > 0) {
+        if (!this.disableMsBuildDiagnosticWarning() && event.diagnostics.Errors.length > 0) {
             this.warningMessageDebouncer.next(event);
         }
     }

src/omnisharp/options.ts

@@ -18,7 +18,8 @@ export class Options {
         public useFormatting?: boolean,
         public showReferencesCodeLens?: boolean,
         public showTestsCodeLens?: boolean,
-        public disableCodeActions?: boolean) { }
+        public disableCodeActions?: boolean,
+        public disableMSBuildDiagnosticWarning?: boolean) { }
 
     public static Read(): Options {
         // Extra effort is taken below to ensure that legacy versions of options
@@ -59,6 +60,8 @@ export class Options {
 
         const disableCodeActions = csharpConfig.get<boolean>('disableCodeActions', false);
 
+        const disableMSBuildDiagnosticWarning = omnisharpConfig.get<boolean>('disableMSBuildDiagnosticWarning');
+
         return new Options(path, 
             useMono, 
             waitForDebugger,
@@ -70,6 +73,7 @@ export class Options {
             useFormatting,
             showReferencesCodeLens,
             showTestsCodeLens,
-            disableCodeActions);
+            disableCodeActions,
+            disableMSBuildDiagnosticWarning);
     }
 }

test/unitTests/logging/WarningMessageObserver.test.ts

@@ -61,7 +61,7 @@ suite('WarningMessageObserver', () => {
         assertionObservable = new Subject<string>();
         scheduler = new TestScheduler(assert.deepEqual);
         scheduler.maxFrames = 9000;
-        observer = new WarningMessageObserver(vscode, scheduler);
+        observer = new WarningMessageObserver(vscode, () => false, scheduler);
         warningMessages = [];
         invokedCommand = undefined;
         commandDone = new Promise<void>(resolve => {
@@ -77,6 +77,15 @@ suite('WarningMessageObserver', () => {
         expect(invokedCommand).to.be.undefined;
     });
 
+    test('OmnisharpServerMsBuildProjectDiagnostics: No event is posted if warning is disabled', () => {
+        let newObserver = new WarningMessageObserver(vscode, () => true, scheduler);
+        let event = getOmnisharpMSBuildProjectDiagnosticsEvent("someFile",
+            [getMSBuildDiagnosticsMessage("warningFile", "", "", 0, 0, 0, 0)],
+            [getMSBuildDiagnosticsMessage("warningFile", "", "", 0, 0, 0, 0)]);
+        newObserver.post(event);
+        expect(warningMessages).to.be.empty;
+    });
+
     [
         getOmnisharpMSBuildProjectDiagnosticsEvent("someFile",
             [getMSBuildDiagnosticsMessage("warningFile", "", "", 1, 2, 3, 4)],