Do not steal the focus when showing the channels

dotnet · Jan 28, 2019 · cfba535 · cfba535
1 parent 99ec969
commit cfba535
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 27 deletions.
diff --git a/src/observers/CsharpChannelObserver.ts b/src/observers/CsharpChannelObserver.ts
@@ -11,13 +11,11 @@ export class CsharpChannelObserver extends BaseChannelObserver {
         switch (event.constructor.name) {
             case PackageInstallStart.name:
             case IntegrityCheckFailure.name:
-                this.showChannel(true);
-                break;
             case InstallationFailure.name:
             case DebuggerNotInstalledFailure.name:
             case DebuggerPrerequisiteFailure.name:
             case ProjectJsonDeprecatedWarning.name:
-                this.showChannel();
+                this.showChannel(true);
                 break;
         }
     }

diff --git a/src/observers/DotnetChannelObserver.ts b/src/observers/DotnetChannelObserver.ts
@@ -11,7 +11,7 @@ export class DotNetChannelObserver extends BaseChannelObserver {
         switch (event.constructor.name) {
             case CommandDotNetRestoreStart.name:
                 this.clearChannel();
-                this.showChannel();
+                this.showChannel(true);
                 break;
         }
     }

diff --git a/src/observers/DotnetTestChannelObserver.ts b/src/observers/DotnetTestChannelObserver.ts
@@ -14,7 +14,7 @@ export default class DotnetTestChannelObserver extends BaseChannelObserver {
             case DotNetTestsInClassRunStart.name: 
             case DotNetTestDebugStart.name:    
             case DotNetTestsInClassDebugStart.name:    
-                this.showChannel();
+                this.showChannel(true);
                 break;
         }
     }

diff --git a/src/observers/OmnisharpChannelObserver.ts b/src/observers/OmnisharpChannelObserver.ts
@@ -13,7 +13,7 @@ export class OmnisharpChannelObserver extends BaseChannelObserver {
             case ShowOmniSharpChannel.name:
             case OmnisharpFailure.name:
             case OmnisharpServerOnStdErr.name:
-                this.showChannel();
+                this.showChannel(true);
                 break;
             case OmnisharpRestart.name:
                 this.clearChannel();

diff --git a/test/unitTests/logging/CsharpChannelObserver.test.ts b/test/unitTests/logging/CsharpChannelObserver.test.ts
@@ -14,26 +14,11 @@ suite("CsharpChannelObserver", () => {
         new InstallationFailure("someStage", "someError"),
         new DebuggerNotInstalledFailure(),
         new DebuggerPrerequisiteFailure("some failure"),
-        new ProjectJsonDeprecatedWarning()
-    ].forEach((event: BaseEvent) => {
-        test(`${event.constructor.name}: Channel is shown`, () => {
-            let hasShown = false;
-
-            let observer = new CsharpChannelObserver({
-                ...getNullChannel(),
-                show: () => { hasShown = true; }
-            });
-
-            observer.post(event);
-            expect(hasShown).to.be.true;
-        });
-    });
-
-    [
+        new ProjectJsonDeprecatedWarning(),
         new IntegrityCheckFailure("", "", true),
         new PackageInstallStart()
     ].forEach((event: BaseEvent) => {
-        test(`${event.constructor.name}: Channel is shown and preserveFocus is set to true`, () => {
+        test(`${event.constructor.name}: Channel is shown and preserve focus is set to true`, () => {
             let hasShown = false;
             let preserveFocus = false;
             let observer = new CsharpChannelObserver({

diff --git a/test/unitTests/logging/DotnetTestChannelObserver.test.ts b/test/unitTests/logging/DotnetTestChannelObserver.test.ts
@@ -10,10 +10,14 @@ import DotnetTestChannelObserver from '../../../src/observers/DotnetTestChannelO
 
 suite("DotnetTestChannelObserver", () => {
     let hasShown: boolean;
+    let preserveFocus: boolean;
 
     let observer = new DotnetTestChannelObserver({
         ...getNullChannel(),
-        show: () => { hasShown = true; }
+        show: (preserve) => {
+            hasShown = true;
+            preserveFocus = preserve;
+        }
     });
 
     setup(() => {
@@ -27,10 +31,11 @@ suite("DotnetTestChannelObserver", () => {
         new DotNetTestDebugStart("foo"),
         new DotNetTestsInClassDebugStart("someclass")
     ].forEach((event: BaseEvent) => {
-        test(`${event.constructor.name}: Channel is shown`, () => {
+        test(`${event.constructor.name}: Channel is shown and preserve focus is set to true`, () => {
             expect(hasShown).to.be.false;
             observer.post(event);
             expect(hasShown).to.be.true;
+            expect(preserveFocus).to.be.true;
         });
     });
 });
diff --git a/test/unitTests/logging/OmnisharpChannelObserver.test.ts b/test/unitTests/logging/OmnisharpChannelObserver.test.ts
@@ -11,14 +11,19 @@ suite("OmnisharpChannelObserver", () => {
 
     let hasShown: boolean;
     let hasCleared: boolean;
+    let preserveFocus: boolean;
     let observer: OmnisharpChannelObserver;
 
     setup(() => {
         hasShown = false;
         hasCleared = false;
+        preserveFocus = false;
         observer = new OmnisharpChannelObserver({
             ...getNullChannel(),
-            show: () => { hasShown = true; },
+            show: (preserve) => {
+                hasShown = true;
+                preserveFocus = preserve;
+            },
             clear: () => { hasCleared = true; }
         });
     });
@@ -28,10 +33,11 @@ suite("OmnisharpChannelObserver", () => {
         new ShowOmniSharpChannel(),
         new OmnisharpServerOnStdErr("std err")
     ].forEach((event: BaseEvent) => {
-        test(`${event.constructor.name}: Channel is shown`, () => {
+        test(`${event.constructor.name}: Channel is shown and preserveFocus is set to true`, () => {
             expect(hasShown).to.be.false;
             observer.post(event);
             expect(hasShown).to.be.true;
+            expect(preserveFocus).to.be.true;
         });
     });