Merge pull request #133 from Harry-Hopkinson/fix-remove-all-pets

Fix the remove-all-pets command.
tonybaloney · Sep 30, 2022 · 056f931 · 056f931
2 parents 6261316 + 683e059
commit 056f931
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -88,13 +88,13 @@
                 "command": "vscode-pets.delete-pet",
                 "title": "Remove pet",
                 "category": "Pet Coding",
-                "icon" : {
+                "icon": {
                     "dark": "media/icon/dark-trash.svg",
                     "light": "media/icon/light-trash.svg"
                 }
             },
             {
-                "command": "vscode-pets.delete-pets",
+                "command": "vscode-pets.remove-all-pets",
                 "title": "Remove all pets",
                 "category": "Pet Coding",
                 "icon": {

diff --git a/src/extension/extension.ts b/src/extension/extension.ts
@@ -246,7 +246,7 @@ function getPetPanel(): IPetPanel | undefined {
     } else if (PetPanel.currentPanel) {
         return PetPanel.currentPanel;
     } else {
-        vscode.window.showErrorMessage("Please open a Pet's Playground first.");
+        return undefined;
     }
 }
 
@@ -359,6 +359,34 @@ export function activate(context: vscode.ExtensionContext) {
                     handleRemovePetMessage,
                     context,
                 );
+            } else {
+                const spec = PetSpecification.fromConfiguration();
+                PetPanel.createOrShow(
+                    context.extensionUri,
+                    context.extensionPath,
+                    spec.color,
+                    spec.type,
+                    spec.size,
+                    getConfiguredTheme(),
+                    getConfiguredThemeKind(),
+                );
+                if (PetPanel.currentPanel) {
+                    var collection = PetSpecification.collectionFromMemento(
+                        context,
+                        getConfiguredSize(),
+                    );
+                    collection.forEach((item) => {
+                        PetPanel.currentPanel!.spawnPet(item);
+                    });
+                    storeCollectionAsMemento(context, collection);
+                } else {
+                    var collection = PetSpecification.collectionFromMemento(
+                        context,
+                        getConfiguredSize(),
+                    );
+                    collection.push(spec);
+                    storeCollectionAsMemento(context, collection);
+                }
             }
         }),
     );
@@ -478,11 +506,42 @@ export function activate(context: vscode.ExtensionContext) {
     );
 
     context.subscriptions.push(
-        vscode.commands.registerCommand('vscode-pets.reset-pets', () => {
+        vscode.commands.registerCommand('vscode-pets.remove-all-pets', () => {
             const panel = getPetPanel();
             if (panel !== undefined) {
                 panel.resetPets();
                 storeCollectionAsMemento(context, []);
+            } else {
+                const spec = PetSpecification.fromConfiguration();
+                PetPanel.createOrShow(
+                    context.extensionUri,
+                    context.extensionPath,
+                    spec.color,
+                    spec.type,
+                    spec.size,
+                    getConfiguredTheme(),
+                    getConfiguredThemeKind(),
+                );
+                if (PetPanel.currentPanel) {
+                    var collection = PetSpecification.collectionFromMemento(
+                        context,
+                        getConfiguredSize(),
+                    );
+                    collection.forEach((item) => {
+                        PetPanel.currentPanel!.spawnPet(item);
+                    });
+                    storeCollectionAsMemento(context, collection);
+                } else {
+                    var collection = PetSpecification.collectionFromMemento(
+                        context,
+                        getConfiguredSize(),
+                    );
+                    collection.push(spec);
+                    storeCollectionAsMemento(context, collection);
+                }
+                vscode.window.showInformationMessage(
+                    "A Pet Playground has been created. You can now use the 'Remove All Pets' Command to remove all pets.",
+                );
             }
         }),
     );