editing in accordance with code reviews

Author: omarArm

package.json

@@ -50,15 +50,15 @@
       "activitybar": [
         {
           "id": "cmsis-debugger",
-          "title": "CMSIS",
+          "title": "CMSIS-Debug",
           "icon": "$(rocket)"
         }
       ]
     },
     "views": {
       "cmsis-debugger": [
         {
-          "id": "cmsis-debugger-view",
+          "id": "cmsis-debugger.liveWatch",
           "name": "Live Watch"
         }
       ]
@@ -79,28 +79,28 @@
         "when": "inDebugMode"
       },
       {
-        "command": "cmsis-debugger-view.add",
+        "command": "cmsis-debugger.liveWatch.add",
         "title": "Add Expression",
         "icon": "$(add)"
       },
       {
-        "command": "cmsis-debugger-view.clear",
-        "title": "Clear All",
-        "icon": "$(trash)"
+        "command": "cmsis-debugger.liveWatch.deleteAll",
+        "title": "Delete All",
+        "icon": "$(close-all)"
       },
       {
-        "command": "cmsis-debugger-view.delete",
+        "command": "cmsis-debugger.liveWatch.delete",
         "title": "Delete",
-        "icon": "$(trash)"
+        "icon": "$(close)"
       },
       {
-        "command": "cmsis-debugger-view.refresh",
+        "command": "cmsis-debugger.liveWatch.refresh",
         "title": "Refresh",
         "icon": "$(refresh)"
       },
       {
-        "command": "cmsis-debugger-view.rename",
-        "title": "Rename",
+        "command": "cmsis-debugger.liveWatch.modify",
+        "title": "Modify",
         "icon": "$(pencil)"
       }
     ],
@@ -117,30 +117,30 @@
       ],
       "view/title": [
         {
-          "command": "cmsis-debugger-view.add",
-          "when": "view == cmsis-debugger-view",
+          "command": "cmsis-debugger.liveWatch.add",
+          "when": "view == cmsis-debugger.liveWatch",
           "group": "navigation@1"
         },
         {
-          "command": "cmsis-debugger-view.clear",
-          "when": "view == cmsis-debugger-view",
+          "command": "cmsis-debugger.liveWatch.deleteAll",
+          "when": "view == cmsis-debugger.liveWatch",
           "group": "navigation@3"
         },
         {
-          "command": "cmsis-debugger-view.refresh",
-          "when": "view == cmsis-debugger-view",
+          "command": "cmsis-debugger.liveWatch.refresh",
+          "when": "view == cmsis-debugger.liveWatch",
           "group": "navigation@2"
         }
       ],
       "view/item/context": [
         {
-          "command": "cmsis-debugger-view.rename",
-          "when": "view == cmsis-debugger-view && viewItem == expression",
+          "command": "cmsis-debugger.liveWatch.modify",
+          "when": "view == cmsis-debugger.liveWatch && viewItem == expression",
           "group": "inline@1"
         },
         {
-          "command": "cmsis-debugger-view.delete",
-          "when": "view == cmsis-debugger-view && viewItem == expression",
+          "command": "cmsis-debugger.liveWatch.delete",
+          "when": "view == cmsis-debugger.liveWatch && viewItem == expression",
           "group": "inline@2"
         }
       ]

src/debug-session/gdbtarget-debug-session.ts

@@ -67,7 +67,7 @@ export class GDBTargetDebugSession {
         } catch (error: unknown) {
             const errorMessage = (error as Error)?.message;
             logger.debug(`Session '${this.session.name}': Failed to evaluate global expression '${expression}' - '${errorMessage}'`);
-            return errorMessage;
+            return errorMessage === 'custom request failed' ? 'No active session' : errorMessage;
         }
     }
 

src/desktop/extension.ts

@@ -22,21 +22,23 @@ import { addToolsToPath } from './add-to-path';
 import { CpuStatesStatusBarItem } from '../features/cpu-states/cpu-states-statusbar-item';
 import { CpuStates } from '../features/cpu-states/cpu-states';
 import { CpuStatesCommands } from '../features/cpu-states/cpu-states-commands';
-import { LiveWatchTreeDataProvider } from '../live-watch/live-watch';
+import { LiveWatchTreeDataProvider } from '../views/live-watch/live-watch';
 
 const BUILTIN_TOOLS_PATHS = [
     'tools/pyocd/pyocd',
     'tools/gdb/bin/arm-none-eabi-gdb'
 ];
 
+let liveWatchTreeDataProvider: LiveWatchTreeDataProvider;
+
 export const activate = async (context: vscode.ExtensionContext): Promise<void> => {
     const gdbtargetDebugTracker = new GDBTargetDebugTracker();
     const gdbtargetConfigurationProvider = new GDBTargetConfigurationProvider();
     const cpuStates = new CpuStates();
     const cpuStatesCommands = new CpuStatesCommands();
     const cpuStatesStatusBarItem = new CpuStatesStatusBarItem();
     // Register the Tree View under the id from package.json
-    const liveWatchTreeDataProvider = new LiveWatchTreeDataProvider(context);
+    liveWatchTreeDataProvider = new LiveWatchTreeDataProvider(context);
 
     addToolsToPath(context, BUILTIN_TOOLS_PATHS);
     // Activate components
@@ -51,3 +53,11 @@ export const activate = async (context: vscode.ExtensionContext): Promise<void>
 
     logger.debug('Extension Pack activated');
 };
+
+export const deactivate = async (): Promise<void> => {
+    // Call deactivate of Live Watch to save its state
+    if (liveWatchTreeDataProvider) {
+        await liveWatchTreeDataProvider.deactivate();
+    }
+    logger.debug('Extension Pack deactivated');
+}

src/features/cpu-states/cpu-states.ts

@@ -214,7 +214,8 @@ export class CpuStates {
     }
 
     protected async getFrequency(): Promise<number|undefined> {
-        const frequencyString = await this.activeSession?.evaluateGlobalExpression('SystemCoreClock');
+        const result = await this.activeSession?.evaluateGlobalExpression('SystemCoreClock');
+        const frequencyString = result?.match(/\d+/) ? result : undefined;
         if (!frequencyString) {
             return undefined;
         }