Hide unavailable view actions and improve filter cancellation

package.json

@@ -372,11 +372,11 @@
         },
         {
           "command": "vscode-cmsis-debugger.liveWatch.enablePeriodicUpdate",
-          "when": "!liveWatch.periodicUpdateEnabled"
+          "when": "inDebugMode && liveWatch.canAccessWhileRunning && !liveWatch.periodicUpdateEnabled"
         },
         {
           "command": "vscode-cmsis-debugger.liveWatch.disablePeriodicUpdate",
-          "when": "liveWatch.periodicUpdateEnabled"
+          "when": "inDebugMode && liveWatch.canAccessWhileRunning && liveWatch.periodicUpdateEnabled"
         },
         {
           "command": "vscode-cmsis-debugger.liveWatch.setValue",
@@ -392,16 +392,20 @@
         },
         {
           "command": "vscode-cmsis-debugger.componentViewer.enablePeriodicUpdate",
-          "when": "!componentViewer.periodicUpdateEnabled"
+          "when": "inDebugMode && componentViewer.canAccessWhileRunning && !componentViewer.periodicUpdateEnabled"
         },
         {
           "command": "vscode-cmsis-debugger.componentViewer.disablePeriodicUpdate",
-          "when": "componentViewer.periodicUpdateEnabled"
+          "when": "inDebugMode && componentViewer.canAccessWhileRunning && componentViewer.periodicUpdateEnabled"
         },
         {
           "command": "vscode-cmsis-debugger.componentViewer.expandAll",
           "when": "false"
         },
+        {
+          "command": "vscode-cmsis-debugger.componentViewer.collapseAll",
+          "when": "false"
+        },
         {
           "command": "vscode-cmsis-debugger.componentViewer.filterTree",
           "when": "false"
@@ -420,11 +424,11 @@
         },
         {
           "command": "vscode-cmsis-debugger.corePeripherals.enablePeriodicUpdate",
-          "when": "!corePeripherals.periodicUpdateEnabled"
+          "when": "inDebugMode && corePeripherals.canAccessWhileRunning && !corePeripherals.periodicUpdateEnabled"
         },
         {
           "command": "vscode-cmsis-debugger.corePeripherals.disablePeriodicUpdate",
-          "when": "corePeripherals.periodicUpdateEnabled"
+          "when": "inDebugMode && corePeripherals.canAccessWhileRunning && corePeripherals.periodicUpdateEnabled"
         },
         {
           "command": "vscode-cmsis-debugger.corePeripherals.expandAll",
@@ -454,7 +458,7 @@
         },
         {
           "command": "vscode-cmsis-debugger.liveWatch.refresh",
-          "when": "view == cmsis-debugger.liveWatch"
+          "when": "inDebugMode && view == cmsis-debugger.liveWatch"
         },
         {
           "command": "vscode-cmsis-debugger.liveWatch.add",
@@ -468,42 +472,42 @@
         },
         {
           "command": "vscode-cmsis-debugger.liveWatch.refresh",
-          "when": "view == cmsis-debugger.liveWatch",
+          "when": "inDebugMode && view == cmsis-debugger.liveWatch",
           "group": "navigation@2"
         },
         {
           "command": "vscode-cmsis-debugger.liveWatch.disablePeriodicUpdate",
-          "when": "view == cmsis-debugger.liveWatch && liveWatch.periodicUpdateEnabled",
+          "when": "inDebugMode && view == cmsis-debugger.liveWatch && liveWatch.canAccessWhileRunning && liveWatch.periodicUpdateEnabled",
           "group": "navigation@3"
         },
         {
           "command": "vscode-cmsis-debugger.liveWatch.enablePeriodicUpdate",
-          "when": "view == cmsis-debugger.liveWatch && !liveWatch.periodicUpdateEnabled",
+          "when": "inDebugMode && view == cmsis-debugger.liveWatch && liveWatch.canAccessWhileRunning && !liveWatch.periodicUpdateEnabled",
           "group": "navigation@3"
         },
         {
           "command": "vscode-cmsis-debugger.componentViewer.expandAll",
-          "when": "view == cmsis-debugger.componentViewer",
+          "when": "inDebugMode && view == cmsis-debugger.componentViewer",
           "group": "navigation@3"
         },
         {
           "command": "vscode-cmsis-debugger.componentViewer.collapseAll",
-          "when": "view == cmsis-debugger.componentViewer",
+          "when": "inDebugMode && view == cmsis-debugger.componentViewer",
           "group": "navigation@4"
         },
         {
           "command": "vscode-cmsis-debugger.corePeripherals.expandAll",
-          "when": "view == cmsis-debugger.corePeripherals",
+          "when": "inDebugMode && view == cmsis-debugger.corePeripherals",
           "group": "navigation@3"
         },
         {
           "command": "vscode-cmsis-debugger.corePeripherals.collapseAll",
-          "when": "view == cmsis-debugger.corePeripherals",
+          "when": "inDebugMode && view == cmsis-debugger.corePeripherals",
           "group": "navigation@4"
         },
         {
           "command": "vscode-cmsis-debugger.componentViewer.filterTree",
-          "when": "view == cmsis-debugger.componentViewer",
+          "when": "inDebugMode && view == cmsis-debugger.componentViewer",
           "group": "navigation@1"
         },
         {
@@ -513,7 +517,7 @@
         },
         {
           "command": "vscode-cmsis-debugger.corePeripherals.filterTree",
-          "when": "view == cmsis-debugger.corePeripherals",
+          "when": "inDebugMode && view == cmsis-debugger.corePeripherals",
           "group": "navigation@1"
         },
         {
@@ -523,22 +527,22 @@
         },
         {
           "command": "vscode-cmsis-debugger.componentViewer.disablePeriodicUpdate",
-          "when": "view == cmsis-debugger.componentViewer && componentViewer.periodicUpdateEnabled",
+          "when": "inDebugMode && view == cmsis-debugger.componentViewer && componentViewer.canAccessWhileRunning && componentViewer.periodicUpdateEnabled",
           "group": "navigation@3"
         },
         {
           "command": "vscode-cmsis-debugger.componentViewer.enablePeriodicUpdate",
-          "when": "view == cmsis-debugger.componentViewer && !componentViewer.periodicUpdateEnabled",
+          "when": "inDebugMode && view == cmsis-debugger.componentViewer && componentViewer.canAccessWhileRunning && !componentViewer.periodicUpdateEnabled",
           "group": "navigation@3"
         },
         {
           "command": "vscode-cmsis-debugger.corePeripherals.disablePeriodicUpdate",
-          "when": "view == cmsis-debugger.corePeripherals && corePeripherals.periodicUpdateEnabled",
+          "when": "inDebugMode && view == cmsis-debugger.corePeripherals && corePeripherals.canAccessWhileRunning && corePeripherals.periodicUpdateEnabled",
           "group": "navigation@3"
         },
         {
           "command": "vscode-cmsis-debugger.corePeripherals.enablePeriodicUpdate",
-          "when": "view == cmsis-debugger.corePeripherals && !corePeripherals.periodicUpdateEnabled",
+          "when": "inDebugMode && view == cmsis-debugger.corePeripherals && corePeripherals.canAccessWhileRunning && !corePeripherals.periodicUpdateEnabled",
           "group": "navigation@3"
         }
       ],
@@ -575,7 +579,7 @@
         },
         {
           "command": "vscode-cmsis-debugger.liveWatch.setValue",
-          "when": "view == cmsis-debugger.liveWatch && inDebugMode && vscode-cmsis-debugger.setExpressionSupported",
+          "when": "inDebugMode && view == cmsis-debugger.liveWatch && vscode-cmsis-debugger.setExpressionSupported",
           "group": "contextMenuG1@5"
         },
         {
@@ -595,12 +599,12 @@
         },
         {
           "command": "cdt.debug.setOutputRadixToDecimal",
-          "when": "(view == cmsis-debugger.liveWatch) && inDebugMode && cdt.debug.outputRadix && cdt.debug.outputRadix != 'decimal' && (debugType == 'gdb' || debugType == 'gdbtarget')",
+          "when": "inDebugMode && (view == cmsis-debugger.liveWatch) && cdt.debug.outputRadix && cdt.debug.outputRadix != 'decimal' && (debugType == 'gdb' || debugType == 'gdbtarget')",
           "group": "contextMenuG4@1"
         },
         {
           "command": "cdt.debug.setOutputRadixToHex",
-          "when": "(view == cmsis-debugger.liveWatch) && inDebugMode && cdt.debug.outputRadix && cdt.debug.outputRadix != 'hexadecimal' && (debugType == 'gdb' || debugType == 'gdbtarget')",
+          "when": "inDebugMode && (view == cmsis-debugger.liveWatch) && cdt.debug.outputRadix && cdt.debug.outputRadix != 'hexadecimal' && (debugType == 'gdb' || debugType == 'gdbtarget')",
           "group": "contextMenuG4@2"
         },
         {

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

@@ -72,7 +72,7 @@ export class CpuStates {
         tracker.onContinued(event => this.handleContinuedEvent(event));
         tracker.onStopped(event => this.handleStoppedEvent(event));
         tracker.onStackTrace(stackTrace => this.handleStackTrace(stackTrace));
-        void vscode.commands.executeCommand('setContext', 'vscode-cmsis-debugger.cpuTimerEnabled', true);
+        vscode.commands.executeCommand('setContext', 'vscode-cmsis-debugger.cpuTimerEnabled', true);
     }
 
     protected handleOnWillStartSession(session: GDBTargetDebugSession): void {
@@ -101,7 +101,7 @@ export class CpuStates {
         this.activeSession = session;
         // Restore enabled/disabled state of CPU Time commands based on persisted settings
         const enabled = session ? (this.sessionCpuStates.get(session.session.id)?.enableCpuStatesFlag ?? true) : false;
-        void vscode.commands.executeCommand('setContext', 'vscode-cmsis-debugger.cpuTimerEnabled', enabled);
+        vscode.commands.executeCommand('setContext', 'vscode-cmsis-debugger.cpuTimerEnabled', enabled);
         this._onRefresh.fire(0);
     }
 
@@ -115,7 +115,7 @@ export class CpuStates {
         cpuStates.configStateKey = configStateKey;
         cpuStates.enableCpuStatesFlag = readCpuStates(configStateKey) ?? true;
         if (this.activeSession?.session.id === session.session.id) {
-            void vscode.commands.executeCommand('setContext', 'vscode-cmsis-debugger.cpuTimerEnabled', cpuStates.enableCpuStatesFlag);
+            vscode.commands.executeCommand('setContext', 'vscode-cmsis-debugger.cpuTimerEnabled', cpuStates.enableCpuStatesFlag);
         }
         // Following call might fail if target not stopped on connect, returns undefined
         // Retry on first Stopped Event.
@@ -369,7 +369,7 @@ export class CpuStates {
         for (const states of this.sessionCpuStates.values()) {
             states.enableCpuStatesFlag = true;
         }
-        void vscode.commands.executeCommand('setContext', 'vscode-cmsis-debugger.cpuTimerEnabled', true);
+        vscode.commands.executeCommand('setContext', 'vscode-cmsis-debugger.cpuTimerEnabled', true);
         logger.info('CPU States: CPU Timer reset');
     }
 };

src/views/component-viewer/component-viewer-base.ts

@@ -147,6 +147,7 @@ export class ComponentViewerBase {
             clearFilterCommandDisposable
         );
         vscode.commands.executeCommand('setContext', `${this._viewId}.periodicUpdateEnabled`, true);
+        vscode.commands.executeCommand('setContext', `${this._viewId}.canAccessWhileRunning`, false);
         return true;
     }
 
@@ -201,44 +202,53 @@ export class ComponentViewerBase {
 
     protected handleFilterTree(): void {
         const inputBox = vscode.window.createInputBox();
+        const originalFilter = this._componentViewerTreeDataProvider.filterPattern;
+        let accepted = false;
         inputBox.placeholder = 'Type a text pattern to filter nodes...';
         inputBox.prompt = `Filter ${this._viewName} tree`;
-        inputBox.value = this._componentViewerTreeDataProvider.filterPattern ?? '';
+        inputBox.value = originalFilter ?? '';
         inputBox.ignoreFocusOut = false;
         this._activeInputBox = inputBox;
 
         const applyFilter = (value: string): void => {
             if (value === '') {
-                this.handleClearFilter();
+                this._componentViewerTreeDataProvider.setFilter(undefined);
+                vscode.commands.executeCommand('setContext', `${this._viewId}.filterActive`, false);
             } else {
                 componentViewerLogger.info(`${this._viewName}: Filter set to '${value}'`);
                 this._componentViewerTreeDataProvider.setFilter(value);
-                void vscode.commands.executeCommand('setContext', `${this._viewId}.filterActive`, true);
+                vscode.commands.executeCommand('setContext', `${this._viewId}.filterActive`, true);
             }
             // Reset the timer so the view state is saved only after the user stops typing for filterDebounceMs.
             if (this._filterDebounceTimer) {
                 clearTimeout(this._filterDebounceTimer);
             }
             this._filterDebounceTimer = setTimeout(() => {
                 this._filterDebounceTimer = undefined;
-                void this.saveCurrentState();
+                this.saveCurrentState();
             }, ComponentViewerBase.filterDebounceMs);
         };
 
         inputBox.onDidChangeValue(value => {
-            if (value.length === 0) {
-                this.handleClearFilter();
-            } else {
-                applyFilter(value);
-            }
+            applyFilter(value);
         });
 
         inputBox.onDidAccept(() => {
+            accepted = true;
             applyFilter(inputBox.value);
             inputBox.hide();
         });
 
         inputBox.onDidHide(() => {
+            if (!accepted && this._activeInputBox === inputBox) {
+                if (this._filterDebounceTimer) {
+                    clearTimeout(this._filterDebounceTimer);
+                    this._filterDebounceTimer = undefined;
+                }
+                this._componentViewerTreeDataProvider.setFilter(originalFilter);
+                vscode.commands.executeCommand('setContext', `${this._viewId}.filterActive`, originalFilter !== undefined);
+                this.saveCurrentState();
+            }
             this._activeInputBox = undefined;
             inputBox.dispose();
         });
@@ -249,16 +259,18 @@ export class ComponentViewerBase {
     protected handleClearFilter(): void {
         componentViewerLogger.info(`${this._viewName}: Filter cleared`);
         this._componentViewerTreeDataProvider.setFilter(undefined);
-        void vscode.commands.executeCommand('setContext', `${this._viewId}.filterActive`, false);
+        vscode.commands.executeCommand('setContext', `${this._viewId}.filterActive`, false);
         if (this._activeInputBox) {
-            this._activeInputBox.hide();
+            const activeInputBox = this._activeInputBox;
+            this._activeInputBox = undefined;
+            activeInputBox.hide();
         }
         // Cancel any pending debounced save and persist the cleared state immediately.
         if (this._filterDebounceTimer) {
             clearTimeout(this._filterDebounceTimer);
             this._filterDebounceTimer = undefined;
         }
-        void this.saveCurrentState();
+        this.saveCurrentState();
     }
 
     protected async readScvdFiles(tracker: GDBTargetDebugTracker, session?: GDBTargetDebugSession): Promise<void> {
@@ -400,6 +412,7 @@ export class ComponentViewerBase {
         // Clear active session if it is the one being stopped
         if (this._activeSession?.session.id === session.session.id) {
             this._activeSession = undefined;
+            vscode.commands.executeCommand('setContext', `${this._viewId}.canAccessWhileRunning`, false);
             this._webviewProvider?.setEmptyMessage('');
             this._webviewProvider?.setLoading(false);
         }
@@ -456,6 +469,7 @@ export class ComponentViewerBase {
     private async handleOnDidChangeActiveDebugSession(session: GDBTargetDebugSession | undefined): Promise<void> {
         // Update debug session
         this._activeSession = session;
+        vscode.commands.executeCommand('setContext', `${this._viewId}.canAccessWhileRunning`, session?.canAccessWhileRunning === true);
         if (session) {
             this._webviewProvider?.setLoading(true);
             await this.restorePeriodicUpdateAndFilter(session);
@@ -473,7 +487,7 @@ export class ComponentViewerBase {
         }
         this._pendingUpdateTimer = setTimeout(() => {
             this._pendingUpdateTimer = undefined;
-            void this.runUpdate(updateReason);
+            this.runUpdate(updateReason);
         }, ComponentViewerBase.pendingUpdateDelayMs);
     }
 

src/views/component-viewer/component-viewer-webview-provider.ts

@@ -158,7 +158,7 @@ export class ComponentViewerWebviewProvider implements vscode.WebviewViewProvide
             return;
         }
         this._renderScheduled = true;
-        void Promise.resolve().then(() => {
+        Promise.resolve().then(() => {
             this._renderScheduled = false;
             this.flushRender();
         });
@@ -188,7 +188,7 @@ export class ComponentViewerWebviewProvider implements vscode.WebviewViewProvide
             resetViewState: this._pendingViewStateReset,
         };
         this._pendingViewStateReset = false;
-        void this._view.webview.postMessage(message);
+        this._view.webview.postMessage(message);
     }
 
     /**