adding add to live watch command in both variables window and watch window

Author: omarArm

package.json

@@ -116,19 +116,43 @@
         "category": "Live Watch"
       },
       {
-        "command": "vscode-cmsis-debugger.liveWatch.addToLiveWatch",
+        "command": "vscode-cmsis-debugger.liveWatch.addToLiveWatchFromTextEditor",
+        "title": "Add To Live Watch",
+        "category": "Live Watch"
+      },
+      {
+        "command": "vscode-cmsis-debugger.liveWatch.addToLiveWatchFromWatchWindow",
+        "title": "Add To Live Watch",
+        "category": "Live Watch"
+      },
+      {
+        "command": "vscode-cmsis-debugger.liveWatch.addToLiveWatchFromVariablesView",
         "title": "Add To Live Watch",
         "category": "Live Watch"
       }
     ],
     "menus": {
       "editor/context": [
         {
-          "command": "vscode-cmsis-debugger.liveWatch.addToLiveWatch",
+          "command": "vscode-cmsis-debugger.liveWatch.addToLiveWatchFromTextEditor",
           "when": "editorTextFocus && resourceScheme == file",
           "group": "z_commands"
         }
       ],
+      "debug/variables/context": [
+        {
+          "command": "vscode-cmsis-debugger.liveWatch.addToLiveWatchFromVariablesView",
+          "when": "inDebugMode",
+          "group": "z_commands"
+        }
+      ],
+      "debug/watch/context": [
+        {
+          "command": "vscode-cmsis-debugger.liveWatch.addToLiveWatchFromWatchWindow",
+          "when": "inDebugMode",
+          "group": "z_commands"
+        }
+      ],
       "commandPalette": [
         {
           "command": "vscode-cmsis-debugger.showCpuTimeHistory",
@@ -163,7 +187,7 @@
           "when": "false"
         },
         {
-          "command": "vscode-cmsis-debugger.liveWatch.addToLiveWatch",
+          "command": "vscode-cmsis-debugger.liveWatch.addToLiveWatchFromTextEditor",
           "when": "false"
         }
       ],

src/views/live-watch/live-watch.test.ts

@@ -277,7 +277,9 @@ describe('LiveWatchTreeDataProvider', () => {
                 'vscode-cmsis-debugger.liveWatch.refresh',
                 'vscode-cmsis-debugger.liveWatch.modify',
                 'vscode-cmsis-debugger.liveWatch.copy',
-                'vscode-cmsis-debugger.liveWatch.addToLiveWatch'
+                'vscode-cmsis-debugger.liveWatch.addToLiveWatchFromTextEditor',
+                'vscode-cmsis-debugger.liveWatch.addToLiveWatchFromWatchWindow',
+                'vscode-cmsis-debugger.liveWatch.addToLiveWatchFromVariablesView'
             ]));
         });
 
@@ -354,6 +356,43 @@ describe('LiveWatchTreeDataProvider', () => {
             await handler();
             expect(refreshSpy).toHaveBeenCalled();
         });
+
+        it('watch window command adds variable name root', async () => {
+            jest.spyOn(liveWatchTreeDataProvider as any, 'evaluate').mockResolvedValue({ result: 'value', variablesReference: 0 });
+            liveWatchTreeDataProvider.activate(tracker);
+            const handler = getRegisteredHandler('vscode-cmsis-debugger.liveWatch.addToLiveWatchFromWatchWindow');
+            expect(handler).toBeDefined();
+            await handler({ variable: { name: 'myWatchVariable' } });
+            const roots = (liveWatchTreeDataProvider as any).roots;
+            expect(roots.length).toBe(1);
+            expect(roots[0].expression).toBe('myWatchVariable');
+        });
+
+        it('watch window command does nothing with falsy payload', async () => {
+            liveWatchTreeDataProvider.activate(tracker);
+            const handler = getRegisteredHandler('vscode-cmsis-debugger.liveWatch.addToLiveWatchFromWatchWindow');
+            await handler(undefined);
+            expect((liveWatchTreeDataProvider as any).roots.length).toBe(0);
+        });
+
+        it('variables view command adds variable name root', async () => {
+            jest.spyOn(liveWatchTreeDataProvider as any, 'evaluate').mockResolvedValue({ result: '12345', variablesReference: 0 });
+            liveWatchTreeDataProvider.activate(tracker);
+            const handler = getRegisteredHandler('vscode-cmsis-debugger.liveWatch.addToLiveWatchFromVariablesView');
+            expect(handler).toBeDefined();
+            const payload = { container: { name: 'local' }, variable: { name: 'localVariable' } };
+            await handler(payload);
+            const roots = (liveWatchTreeDataProvider as any).roots;
+            expect(roots.length).toBe(1);
+            expect(roots[0].expression).toBe('localVariable');
+        });
+
+        it('variables view command does nothing when variable missing', async () => {
+            liveWatchTreeDataProvider.activate(tracker);
+            const handler = getRegisteredHandler('vscode-cmsis-debugger.liveWatch.addToLiveWatchFromVariablesView');
+            await handler({ container: { name: 'local' } });
+            expect((liveWatchTreeDataProvider as any).roots.length).toBe(0);
+        });
     });
 
     describe('evaluate', () => {

src/views/live-watch/live-watch.ts

@@ -140,10 +140,12 @@ export class LiveWatchTreeDataProvider implements vscode.TreeDataProvider<LiveWa
         const refreshCommand = vscode.commands.registerCommand('vscode-cmsis-debugger.liveWatch.refresh', async () => await this.refresh());
         const modifyCommand = vscode.commands.registerCommand('vscode-cmsis-debugger.liveWatch.modify', async (node) => await this.registerRenameCommand(node));
         const copyCommand = vscode.commands.registerCommand('vscode-cmsis-debugger.liveWatch.copy', async (node) => { await this.registerCopyCommand(node); });
-        const addToLiveWatchCommand = vscode.commands.registerCommand('vscode-cmsis-debugger.liveWatch.addToLiveWatch', async () => { await this.registerAddFromSelectionCommand(); });
+        const addToLiveWatchCommand = vscode.commands.registerCommand('vscode-cmsis-debugger.liveWatch.addToLiveWatchFromTextEditor', async () => { await this.registerAddFromSelectionCommand(); });
+        const addToLiveWatchFromWatchWindowCommand = vscode.commands.registerCommand('vscode-cmsis-debugger.liveWatch.addToLiveWatchFromWatchWindow', async (expression) => { await this.registerAddToLiveWatchFromWatchWindow(expression); });
+        const addToLiveWatchFromVariablesViewCommand = vscode.commands.registerCommand('vscode-cmsis-debugger.liveWatch.addToLiveWatchFromVariablesView', async (payload: { container: DebugProtocol.Scope; variable: DebugProtocol.Variable;}) => { await this.registerAddToLiveWatchFromVariablesView(payload); });
         this._context.subscriptions.push(registerLiveWatchView,
             addCommand,
-            deleteAllCommand, deleteCommand, refreshCommand, modifyCommand, copyCommand, addToLiveWatchCommand);
+            deleteAllCommand, deleteCommand, refreshCommand, modifyCommand, copyCommand, addToLiveWatchCommand, addToLiveWatchFromWatchWindowCommand, addToLiveWatchFromVariablesViewCommand);
     }
 
     private async registerAddCommand() {
@@ -199,6 +201,20 @@ export class LiveWatchTreeDataProvider implements vscode.TreeDataProvider<LiveWa
         await this.addToRoots(selectedText);
     }
 
+    private async registerAddToLiveWatchFromWatchWindow(expression: any) {
+        if (!expression) {
+            return;
+        }
+        await this.addToRoots(expression.variable.name);
+    }
+
+    private async registerAddToLiveWatchFromVariablesView(payload: { container: DebugProtocol.Scope; variable: DebugProtocol.Variable;}) {
+        if (!payload || !payload.variable) {
+            return;
+        }
+        await this.addToRoots(payload.variable.name);
+    }
+
     private async evaluate(expression: string): Promise<LiveWatchValue> {
         const response: LiveWatchValue = { result: '', variablesReference: 0 };
         if (!this._activeSession) {