Skip to content

Commit 8ad3500

Browse files
authored
Merge pull request #2722 from akshita31/remove_focus
Do not focus on the C# channel when installing dependencies
2 parents ddcc048 + 1c201ca commit 8ad3500

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

src/observers/BaseChannelObserver.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ export abstract class BaseChannelObserver {
1313

1414
abstract post: (event: BaseEvent) => void;
1515

16-
public showChannel(preserveFocusOrColumn?: boolean) {
17-
this.channel.show(preserveFocusOrColumn);
16+
public showChannel(preserveFocus?: boolean) {
17+
this.channel.show(preserveFocus);
1818
}
1919

2020
public clearChannel() {

src/observers/CsharpChannelObserver.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ export class CsharpChannelObserver extends BaseChannelObserver {
1010
public post = (event: BaseEvent) => {
1111
switch (event.constructor.name) {
1212
case PackageInstallStart.name:
13+
this.showChannel(true);
14+
break;
1315
case InstallationFailure.name:
1416
case DebuggerNotInstalledFailure.name:
1517
case DebuggerPrerequisiteFailure.name:

test/unitTests/logging/CsharpChannelObserver.test.ts

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ suite("CsharpChannelObserver", () => {
1212
suiteSetup(() => should());
1313
[
1414
new InstallationFailure("someStage", "someError"),
15-
new PackageInstallStart(),
1615
new DebuggerNotInstalledFailure(),
1716
new DebuggerPrerequisiteFailure("some failure"),
1817
new ProjectJsonDeprecatedWarning()
@@ -29,4 +28,21 @@ suite("CsharpChannelObserver", () => {
2928
expect(hasShown).to.be.true;
3029
});
3130
});
31+
32+
test(`${PackageInstallStart.name}: Channel is shown and preserveFocus is set to true`, () => {
33+
let hasShown = false;
34+
let preserveFocus = false;
35+
let event = new PackageInstallStart();
36+
let observer = new CsharpChannelObserver({
37+
...getNullChannel(),
38+
show: (preserve) => {
39+
hasShown = true;
40+
preserveFocus = preserve;
41+
}
42+
});
43+
44+
observer.post(event);
45+
expect(hasShown).to.be.true;
46+
expect(preserveFocus).to.be.true;
47+
})
3248
});

0 commit comments

Comments
 (0)