Adds an expression from source file to Live Watch

Author: omarArm

package.json

@@ -114,9 +114,21 @@
         "command": "vscode-cmsis-debugger.liveWatch.copy",
         "title": "Copy Expression",
         "category": "Live Watch"
+      },
+      {
+        "command": "vscode-cmsis-debugger.liveWatch.addToLiveWatch",
+        "title": "Add To Live Watch",
+        "category": "Live Watch"
       }
     ],
     "menus": {
+      "editor/context": [
+        {
+          "command": "vscode-cmsis-debugger.liveWatch.addToLiveWatch",
+          "when": "editorTextFocus && editorHasSelection && resourceScheme == file",
+          "group": "5_cutcopypaste@1"
+        }
+      ],
       "commandPalette": [
         {
           "command": "vscode-cmsis-debugger.showCpuTimeHistory",
@@ -149,6 +161,10 @@
         {
           "command": "vscode-cmsis-debugger.liveWatch.copy",
           "when": "false"
+        },
+        {
+          "command": "vscode-cmsis-debugger.liveWatch.addToLiveWatch",
+          "when": "false"
         }
       ],
       "view/title": [

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

@@ -199,6 +199,20 @@ describe('LiveWatchTreeDataProvider', () => {
             await (liveWatchTreeDataProvider as any).registerCopyCommand(node);
             expect(vscode.env.clipboard.writeText).toHaveBeenCalledWith('node-to-copy');
         });
+
+        it('AddFromSelection adds selected text as new live watch expression to roots', async () => {
+            (vscode.window as any).activeTextEditor = {
+                document: {
+                    getText: jest.fn().mockReturnValue('selected-expression')
+                },
+                selection: {} // dummy selection
+            };
+            jest.spyOn(liveWatchTreeDataProvider as any, 'evaluate').mockResolvedValue({ result: '5678', variablesReference: 0 });
+            await (liveWatchTreeDataProvider as any).registerAddFromSelectionCommand();
+            expect((liveWatchTreeDataProvider as any).roots.length).toBe(1);
+            expect((liveWatchTreeDataProvider as any).roots[0].expression).toBe('selected-expression');
+            expect((liveWatchTreeDataProvider as any).roots[0].value.result).toBe('5678');
+        });
     });
 
     describe('refresh', () => {
@@ -255,7 +269,8 @@ describe('LiveWatchTreeDataProvider', () => {
                 'vscode-cmsis-debugger.liveWatch.delete',
                 'vscode-cmsis-debugger.liveWatch.refresh',
                 'vscode-cmsis-debugger.liveWatch.modify',
-                'vscode-cmsis-debugger.liveWatch.copy'
+                'vscode-cmsis-debugger.liveWatch.copy',
+                'vscode-cmsis-debugger.liveWatch.addToLiveWatch'
             ]));
         });
 

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

@@ -139,9 +139,10 @@ 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(); });
         this._context.subscriptions.push(registerLiveWatchView,
             addCommand,
-            deleteAllCommand, deleteCommand, refreshCommand, modifyCommand, copyCommand);
+            deleteAllCommand, deleteCommand, refreshCommand, modifyCommand, copyCommand, addToLiveWatchCommand);
     }
 
     private async registerAddCommand() {
@@ -181,6 +182,19 @@ export class LiveWatchTreeDataProvider implements vscode.TreeDataProvider<LiveWa
         await vscode.env.clipboard.writeText(node.expression);
     }
 
+    private async registerAddFromSelectionCommand() {
+        const editor = vscode.window.activeTextEditor;
+        if (!editor) {
+            return;
+        }
+        const selection = editor.selection;
+        const selectedText = editor.document.getText(selection).trim();
+        if (!selectedText) {
+            return;
+        }
+        await this.addToRoots(selectedText);
+    }
+
     private async evaluate(expression: string): Promise<LiveWatchValue> {
         const response: LiveWatchValue = { result: '', variablesReference: 0 };
         if (!this._activeSession) {