Handle custom radix event (#221)

* handling custom event for radix change
* making both commands available when a third radix option is chosen

Fixes #219

Author: omarArm

package.json

@@ -77,13 +77,13 @@
         "command": "cdt.debug.setOutputRadixToHex",
         "category": "CDT-GDB",
         "title": "Set Global Output Radix to Hex",
-        "enablement": "cdt.debug.outputRadix == 'decimal'"
+        "enablement": "cdt.debug.outputRadix != 'hexadecimal'"
       },
       {
         "command": "cdt.debug.setOutputRadixToDecimal",
         "category": "CDT-GDB",
         "title": "Set Global Output Radix to Decimal",
-        "enablement": "cdt.debug.outputRadix == 'hexadecimal'"
+        "enablement": "cdt.debug.outputRadix != 'decimal'"
       },
       {
         "title": "CDT-GDB: Set Hardware Breakpoint",
@@ -900,36 +900,36 @@
       "debug/watch/context": [
         {
           "command": "cdt.debug.setOutputRadixToHex",
-          "when": "inDebugMode && cdt.debug.outputRadix == 'decimal' && (debugType == gdb || debugType == gdbtarget)",
+          "when": "inDebugMode && cdt.debug.outputRadix != 'hexadecimal' && (debugType == gdb || debugType == gdbtarget)",
           "group": "z_commands"
         },
         {
           "command": "cdt.debug.setOutputRadixToDecimal",
-          "when": "inDebugMode && cdt.debug.outputRadix == 'hexadecimal' && (debugType == gdb || debugType == gdbtarget)",
+          "when": "inDebugMode && cdt.debug.outputRadix != 'decimal' && (debugType == gdb || debugType == gdbtarget)",
           "group": "z_commands"
         }
       ],
       "debug/variables/context": [
         {
           "command": "cdt.debug.setOutputRadixToHex",
-          "when": "inDebugMode && cdt.debug.outputRadix == 'decimal' && (debugType == gdb || debugType == gdbtarget)",
+          "when": "inDebugMode && cdt.debug.outputRadix != 'hexadecimal' && (debugType == gdb || debugType == gdbtarget)",
           "group": "z_commands"
         },
         {
           "command": "cdt.debug.setOutputRadixToDecimal",
-          "when": "inDebugMode && cdt.debug.outputRadix == 'hexadecimal' && (debugType == gdb || debugType == gdbtarget)",
+          "when": "inDebugMode && cdt.debug.outputRadix != 'decimal' && (debugType == gdb || debugType == gdbtarget)",
           "group": "z_commands"
         }
       ],
       "editor/context": [
         {
           "command": "cdt.debug.setOutputRadixToHex",
-          "when": "inDebugMode && cdt.debug.outputRadix == 'decimal' && (debugType == gdb || debugType == gdbtarget)",
+          "when": "inDebugMode && cdt.debug.outputRadix != 'hexadecimal' && (debugType == gdb || debugType == gdbtarget)",
           "group": "z_commands"
         },
         {
           "command": "cdt.debug.setOutputRadixToDecimal",
-          "when": "inDebugMode && cdt.debug.outputRadix == 'hexadecimal' && (debugType == gdb || debugType == gdbtarget)",
+          "when": "inDebugMode && cdt.debug.outputRadix != 'decimal' && (debugType == gdb || debugType == gdbtarget)",
           "group": "z_commands"
         },
         {

src/switchRadix.ts

@@ -11,7 +11,7 @@
 import * as vscode from 'vscode';
 import { DebugProtocol } from '@vscode/debugprotocol';
 
-type Radix = 'hexadecimal' | 'decimal';
+type Radix = 'hexadecimal' | 'decimal' | 'others';
 
 export class SwitchRadix {
     private _sessionsMap: Map<string, Radix> = new Map();
@@ -20,9 +20,25 @@ export class SwitchRadix {
         vscode.debug.onDidStartDebugSession((session) => this.addCurrentRadixContext(session));
         vscode.debug.onDidTerminateDebugSession((session) => this._sessionsMap.delete(session.id));
         vscode.commands.executeCommand('setContext', 'cdt.debug.outputRadix', 'decimal');
+        vscode.debug.onDidReceiveDebugSessionCustomEvent((event) => this.handleOnDidReceiveCustomEvent(event));
         this.registerCommands(context);
     }
 
+    private handleOnDidReceiveCustomEvent(event: vscode.DebugSessionCustomEvent) {
+        if(event.session.type === 'gdb' || event.session.type === 'gdbtarget') {
+            if (event.event === 'OutputRadixUpdated') {
+                if(event.body.radix === '16' || event.body.radix === '10') {
+                    const radix = event.body.radix === '16' ? 'hexadecimal' : 'decimal';
+                    this._sessionsMap.set(event.session.id, radix);
+                    vscode.commands.executeCommand('setContext', 'cdt.debug.outputRadix', radix);
+                } else {
+                    vscode.commands.executeCommand('setContext', 'cdt.debug.outputRadix', 'others');
+                    this._sessionsMap.set(event.session.id, 'others');
+                }
+            }
+        }
+    }
+
     private addCurrentRadixContext(session: vscode.DebugSession) {
         if (!this._sessionsMap.has(session.id)) {
             this._sessionsMap.set(session.id, 'decimal');
@@ -38,7 +54,6 @@ export class SwitchRadix {
         const existingSessionRadix = this._sessionsMap.get(session.id);
         if (existingSessionRadix) {
             vscode.commands.executeCommand('setContext', 'cdt.debug.outputRadix', existingSessionRadix);
-            this.handleSetOutputRadix(existingSessionRadix);
             return;
         }
     }