Show an error message instead of warning

Author: akshita31

src/main.ts

@@ -30,6 +30,7 @@ import { ProjectStatusBarObserver } from './observers/ProjectStatusBarObserver';
 import CSharpExtensionExports from './CSharpExtensionExports';
 import { Options } from './omnisharp/options';
 import { vscodeNetworkSettingsProvider, NetworkSettingsProvider } from './NetworkSettings';
+import { ErrorMessageObserver } from './observers/ErrorMessageObserver';
 
 export async function activate(context: vscode.ExtensionContext): Promise<CSharpExtensionExports> {
 
@@ -67,6 +68,9 @@ export async function activate(context: vscode.ExtensionContext): Promise<CSharp
     let informationMessageObserver = new InformationMessageObserver(vscode);
     eventStream.subscribe(informationMessageObserver.post);
 
+    let errorMessageObserver = new ErrorMessageObserver(vscode);
+    eventStream.subscribe(errorMessageObserver.post);
+
     let omnisharpStatusBar = new StatusBarItemAdapter(vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, Number.MIN_VALUE));
     let omnisharpStatusBarObserver = new OmnisharpStatusBarObserver(omnisharpStatusBar);
     eventStream.subscribe(omnisharpStatusBarObserver.post);

src/observers/ErrorMessageObserver.ts

@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+ 
+import { BaseEvent, ZipError } from "../omnisharp/loggingEvents";
+import { vscode } from "../vscodeAdapter";
+ 
+export class ErrorMessageObserver {
+
+    constructor(private vscode: vscode) {
+    }
+
+    public post = (event: BaseEvent) => {
+        switch (event.constructor.name) {
+            case ZipError.name:
+                this.handleZipError(<ZipError>event);
+                break;
+        }
+    }
+
+    private async handleZipError(event: ZipError) {
+        await showErrorMessage(this.vscode, event.message);
+    }
+}
+
+async function showErrorMessage(vscode: vscode, message: string, ...items: string[]) {
+    try {
+        await vscode.window.showErrorMessage(message, ...items);
+    }
+    catch (err) {
+        console.log(err);
+    }
+}

src/observers/WarningMessageObserver.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { MessageItem, vscode } from '../vscodeAdapter';
-import { BaseEvent, OmnisharpServerOnError, OmnisharpServerMsBuildProjectDiagnostics, ZipError } from "../omnisharp/loggingEvents";
+import { BaseEvent, OmnisharpServerOnError, OmnisharpServerMsBuildProjectDiagnostics } from "../omnisharp/loggingEvents";
 import { Scheduler } from 'rxjs/Scheduler';
 import { Subject } from 'rxjs/Subject';
 import 'rxjs/add/operator/debounceTime';
@@ -32,9 +32,6 @@ export class WarningMessageObserver {
             case OmnisharpServerMsBuildProjectDiagnostics.name:
                 this.handleOmnisharpServerMsBuildProjectDiagnostics(<OmnisharpServerMsBuildProjectDiagnostics>event);
                 break;
-            case ZipError.name:
-                this.handleZipError(<ZipError>event);
-                break;
         }
     }
 
@@ -43,10 +40,6 @@ export class WarningMessageObserver {
             this.warningMessageDebouncer.next(event);
         }
     }
-
-    private async handleZipError(event: ZipError) {
-        await showWarningMessage(this.vscode, event.message);
-    }
 }
 
 async function showWarningMessage(vscode: vscode, message: string, ...items: MessageItemWithCommand[]) {

src/vscodeAdapter.ts

@@ -900,6 +900,7 @@ export interface vscode {
         activeTextEditor: TextEditor | undefined;
         showInformationMessage: (message: string, ...items: string[]) => Thenable<string | undefined>;
         showWarningMessage: <T extends MessageItem>(message: string, ...items: T[]) => Thenable<T | undefined>;
+        showErrorMessage(message: string, ...items: string[]): Thenable<string | undefined>;
     };
     workspace: {
         getConfiguration: (section?: string, resource?: Uri) => WorkspaceConfiguration;

test/unitTests/logging/ErrorMessageObserver.test.ts

@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { use as chaiUse, expect, should } from 'chai';
+import { vscode } from '../../../src/vscodeAdapter';
+import { getFakeVsCode } from '../testAssets/Fakes';
+import 'rxjs/add/observable/fromPromise';
+import 'rxjs/add/operator/timeout';
+import { ErrorMessageObserver } from '../../../src/observers/ErrorMessageObserver';
+import { ZipError } from '../../../src/omnisharp/loggingEvents';
+
+chaiUse(require('chai-as-promised'));
+chaiUse(require('chai-string'));
+
+suite("ErrorMessageObserver", () => {
+    suiteSetup(() => should());
+
+    let vscode: vscode = getFakeVsCode();
+    let errorMessage: string;
+    let observer = new ErrorMessageObserver(vscode);
+
+    vscode.window.showErrorMessage = async (message: string, ...items: string[]) => {
+        errorMessage = message;
+        return Promise.resolve<string>("Done");
+    };
+
+    setup(() => {
+        errorMessage = undefined;
+    });
+
+    test('ZipError: Error message is shown', () => {
+        let event = new ZipError("This is an error");
+            observer.post(event);
+            expect(errorMessage).to.be.equal("This is an error");
+    });   
+});

test/unitTests/logging/WarningMessageObserver.test.ts

@@ -6,7 +6,7 @@
 import { WarningMessageObserver } from '../../../src/observers/WarningMessageObserver';
 import { assert, use as chaiUse, expect, should } from 'chai';
 import { getFakeVsCode, getMSBuildDiagnosticsMessage, getOmnisharpMSBuildProjectDiagnosticsEvent, getOmnisharpServerOnErrorEvent } from '../testAssets/Fakes';
-import { BaseEvent, ZipError } from '../../../src/omnisharp/loggingEvents';
+import { BaseEvent } from '../../../src/omnisharp/loggingEvents';
 import { vscode } from '../../../src/vscodeAdapter';
 import { TestScheduler } from 'rxjs/testing/TestScheduler';
 import { Observable } from 'rxjs/Observable';
@@ -172,15 +172,6 @@ suite('WarningMessageObserver', () => {
             });
         });
     });
-
-    suite('ZipError', () => {
-        test('When the event is fired then a warning message is displayed', () => {
-            let event = new ZipError("This is an error");
-            observer.post(event);
-            expect(warningMessages.length).to.be.equal(1);
-            expect(warningMessages[0]).to.be.equal("This is an error");
-        });
-    });
 });
 
 function timeToMarble(timeinMilliseconds: number): string {

test/unitTests/testAssets/Fakes.ts

@@ -132,6 +132,9 @@ export function getFakeVsCode(): vscode.vscode {
             },
             showWarningMessage: <T extends MessageItem>(message: string, ...items: T[]) => {
                 throw new Error("Not Implemented");
+            },
+            showErrorMessage: (message: string, ...items: string[]) => {
+                throw new Error("Not Implemented");
             }
         },
         workspace: {