Skip to content

Commit 67d51c4

Browse files
authored
Merge pull request #411 from Harry-Hopkinson/fix-panel-not-active-error-message-for-#389
Fix panel not active message.
2 parents 05c12e1 + 418f4e8 commit 67d51c4

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

src/extension/extension.ts

+6-13
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ export function storeCollectionAsMemento(
187187
]);
188188
}
189189

190-
let petPlaygroundStatusBar: vscode.StatusBarItem;
191190
let spawnPetStatusBar: vscode.StatusBarItem;
192191

193192
interface IPetInfo {
@@ -309,14 +308,6 @@ export function activate(context: vscode.ExtensionContext) {
309308
}),
310309
);
311310

312-
// status bar item
313-
petPlaygroundStatusBar = vscode.window.createStatusBarItem(
314-
vscode.StatusBarAlignment.Right,
315-
100,
316-
);
317-
petPlaygroundStatusBar.command = 'vscode-pets.start';
318-
context.subscriptions.push(petPlaygroundStatusBar);
319-
320311
spawnPetStatusBar = vscode.window.createStatusBarItem(
321312
vscode.StatusBarAlignment.Right,
322313
100,
@@ -491,6 +482,12 @@ export function activate(context: vscode.ExtensionContext) {
491482
context.subscriptions.push(
492483
vscode.commands.registerCommand('vscode-pets.spawn-pet', async () => {
493484
const panel = getPetPanel();
485+
if (
486+
getConfigurationPosition() === ExtPosition.explorer &&
487+
webviewViewProvider
488+
) {
489+
vscode.commands.executeCommand('petsView.focus');
490+
}
494491
if (panel) {
495492
const selectedPetType = await vscode.window.showQuickPick(
496493
localize.stringListAsQuickPickItemList<PetType>(ALL_PETS),
@@ -643,10 +640,6 @@ function updateStatusBar(): void {
643640
spawnPetStatusBar.show();
644641
}
645642

646-
export function petPlaygroundDeactivate() {
647-
petPlaygroundStatusBar.dispose();
648-
}
649-
650643
export function spawnPetDeactivate() {
651644
spawnPetStatusBar.dispose();
652645
}

0 commit comments

Comments
 (0)