Issue #386 (Different pets with same name all deleted)

src/extension/extension.ts

@@ -31,10 +31,12 @@ class PetQuickPickItem implements vscode.QuickPickItem {
         public readonly name_: string,
         public readonly type: string,
         public readonly color: string,
+        public readonly petId: number,
     ) {
         this.name = name_;
         this.label = name_;
         this.description = `${color} ${type}`;
+        this.petId = petId;
     }
 
     name: string;
@@ -110,6 +112,7 @@ export class PetSpecification {
         this.color = color;
         this.type = type;
         this.size = size;
+
         if (!name) {
             this.name = randomName(type);
         } else {
@@ -194,6 +197,7 @@ interface IPetInfo {
     type: PetType;
     name: string;
     color: PetColor;
+    petId: number;
 }
 
 async function handleRemovePetMessage(
@@ -209,6 +213,7 @@ async function handleRemovePetMessage(
                     type: parts[0] as PetType,
                     name: parts[1],
                     color: parts[2] as PetColor,
+                    petId: Number(parts[3]),
                 });
             });
             break;
@@ -221,7 +226,12 @@ async function handleRemovePetMessage(
     await vscode.window
         .showQuickPick<PetQuickPickItem>(
             petList.map((val) => {
-                return new PetQuickPickItem(val.name, val.type, val.color);
+                return new PetQuickPickItem(
+                    val.name,
+                    val.type,
+                    val.color,
+                    val.petId,
+                );
             }),
             {
                 placeHolder: vscode.l10n.t('Select the pet to remove.'),
@@ -231,10 +241,10 @@ async function handleRemovePetMessage(
             if (pet) {
                 const panel = getPetPanel();
                 if (panel !== undefined) {
-                    panel.deletePet(pet.name);
+                    panel.deletePet(pet.name, pet.petId);
                     const collection = petList
                         .filter((item) => {
-                            return item.name !== pet.name;
+                            return item.petId !== pet.petId;
                         })
                         .map<PetSpecification>((item) => {
                             return new PetSpecification(
@@ -370,6 +380,7 @@ export function activate(context: vscode.ExtensionContext) {
             const panel = getPetPanel();
             if (panel !== undefined) {
                 panel.listPets();
+
                 getWebview()?.onDidReceiveMessage(
                     handleRemovePetMessage,
                     context,
@@ -666,7 +677,7 @@ interface IPetPanel {
     throwBall(): void;
     resetPets(): void;
     spawnPet(spec: PetSpecification): void;
-    deletePet(petName: string): void;
+    deletePet(petName: string, petId: number): void;
     listPets(): void;
     rollCall(): void;
     themeKind(): vscode.ColorThemeKind;
@@ -786,8 +797,12 @@ class PetWebviewContainer implements IPetPanel {
         this.getWebview().postMessage({ command: 'roll-call' });
     }
 
-    public deletePet(petName: string) {
-        this.getWebview().postMessage({ command: 'delete-pet', name: petName });
+    public deletePet(petName: string, petId: number) {
+        this.getWebview().postMessage({
+            command: 'delete-pet',
+            name: petName,
+            petId: petId,
+        });
     }
 
     protected getWebview(): vscode.Webview {
@@ -964,8 +979,12 @@ class PetPanel extends PetWebviewContainer implements IPetPanel {
         this.getWebview().postMessage({ command: 'roll-call' });
     }
 
-    public deletePet(petName: string): void {
-        this.getWebview().postMessage({ command: 'delete-pet', name: petName });
+    public deletePet(petName: string, petId: number): void {
+        this.getWebview().postMessage({
+            command: 'delete-pet',
+            name: petName,
+            petId: petId,
+        });
     }
 
     public static revive(

src/panel/basepettype.ts

@@ -18,6 +18,7 @@ export class InvalidStateException {}
 export abstract class BasePetType implements IPetType {
     label: string = 'base';
     static count: number = 0;
+    static idMaker: number = 0;
     sequence: ISequenceTree = {
         startingState: States.sitIdle,
         sequenceStates: [],
@@ -27,6 +28,7 @@ export abstract class BasePetType implements IPetType {
     currentStateEnum: States;
     holdState: IState | undefined;
     holdStateEnum: States | undefined;
+    petId: number;
     private el: HTMLImageElement;
     private collision: HTMLDivElement;
     private speech: HTMLDivElement;
@@ -66,6 +68,9 @@ export abstract class BasePetType implements IPetType {
         this._size = size;
         this._speed = this.randomizeSpeed(speed);
 
+        //increment petId: unique identifier for all pets
+        this.petId = ++BasePetType.idMaker;
+
         // Increment the static count of the Pet class that the constructor belongs to
         (this.constructor as any).count += 1;
     }

src/panel/main.ts

@@ -559,7 +559,8 @@ export function petPanelApp(
                     command: 'list-pets',
                     text: pets
                         .map(
-                            (pet) => `${pet.type},${pet.pet.name},${pet.color}`,
+                            (pet) =>
+                                `${pet.type},${pet.pet.name},${pet.color},${pet.pet.petId}`,
                         )
                         .join('\n'),
                 });
@@ -578,7 +579,7 @@ export function petPanelApp(
             case 'delete-pet':
                 var pet = allPets.locate(message.name);
                 if (pet) {
-                    allPets.remove(message.name);
+                    allPets.remove(message.petId);
                     saveState(stateApi);
                     stateApi?.postMessage({
                         command: 'info',

src/panel/pets.ts

@@ -23,6 +23,7 @@ export class PetElement {
     pet: IPetType;
     color: PetColor;
     type: PetType;
+    petId: number;
     remove() {
         this.el.remove();
         this.collision.remove();
@@ -45,6 +46,7 @@ export class PetElement {
         this.pet = pet;
         this.color = color;
         this.type = type;
+        this.petId = pet.petId;
     }
 }
 
@@ -54,7 +56,7 @@ export interface IPetCollection {
     reset(): void;
     seekNewFriends(): string[];
     locate(name: string): PetElement | undefined;
-    remove(name: string): void;
+    remove(id: number): void;
 }
 
 export class PetCollection implements IPetCollection {
@@ -85,14 +87,14 @@ export class PetCollection implements IPetCollection {
         });
     }
 
-    remove(name: string): any {
+    remove(id: number): any {
         this._pets.forEach((pet) => {
-            if (pet.pet.name === name) {
+            if (pet.pet.petId === id) {
                 pet.remove();
             }
         });
         this._pets = this._pets.filter((pet) => {
-            return pet.pet.name !== name;
+            return pet.pet.petId !== id;
         });
     }
 

src/panel/states.ts

@@ -3,6 +3,7 @@ import { PetColor, PetType } from '../common/types';
 export interface IPetType {
     nextFrame(): void;
 
+    petId: number;
     // Special methods for actions
     canSwipe: boolean;
     canChase: boolean;

src/test/suite/panel.test.ts

@@ -96,6 +96,7 @@ suite('Pets Test Suite', () => {
         assert.ok(testPet instanceof Cat);
         assert.equal(testPet.emoji, '🐱');
         assert.equal(testPet.name, 'Jerry');
+        assert.equal(testPet.petId, 1);
 
         const testPetElement = new pets.PetElement(
             petImageEl,
@@ -113,7 +114,7 @@ suite('Pets Test Suite', () => {
         collection.push(testPetElement);
         assert.strictEqual(collection.locate('Jerry'), testPetElement);
 
-        collection.remove('Jerry');
+        collection.remove(1);
         assert.strictEqual(collection.locate('Jerry'), undefined);
     });