From 69c5c9d5d9b99a6406f50e82f5f40d3833735b20 Mon Sep 17 00:00:00 2001
From: Martin Fleck <mfleck@eclipsesource.com>
Date: Wed, 13 Mar 2024 12:07:25 +0100
Subject: [PATCH] Unify usage of hex address conversion

---
 src/plugin/adapter-registry/adapter-capabilities.ts | 4 ++++
 src/plugin/adapter-registry/c-tracker.ts            | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/plugin/adapter-registry/adapter-capabilities.ts b/src/plugin/adapter-registry/adapter-capabilities.ts
index b8e1940..06088e4 100644
--- a/src/plugin/adapter-registry/adapter-capabilities.ts
+++ b/src/plugin/adapter-registry/adapter-capabilities.ts
@@ -38,6 +38,10 @@ export type VariablesTree = Record<number, WithChildren<DebugProtocol.Scope | De
 export const hexAddress = /0x[0-9a-f]+/i;
 export const notADigit = /[^0-9]/;
 
+export function findHexAddress(text?: string): string | undefined {
+    return text ? hexAddress.exec(text)?.[0] : undefined;
+}
+
 /** This class implements some of the basic elements of tracking adapter sessions in order to maintain a list of variables. */
 export class AdapterVariableTracker implements vscode.DebugAdapterTracker {
     protected currentFrame?: number;
diff --git a/src/plugin/adapter-registry/c-tracker.ts b/src/plugin/adapter-registry/c-tracker.ts
index 8c3caa8..e7931cb 100644
--- a/src/plugin/adapter-registry/c-tracker.ts
+++ b/src/plugin/adapter-registry/c-tracker.ts
@@ -16,7 +16,7 @@
 
 import * as vscode from 'vscode';
 import { DebugProtocol } from '@vscode/debugprotocol';
-import { AdapterVariableTracker, hexAddress, notADigit } from './adapter-capabilities';
+import { AdapterVariableTracker, findHexAddress, hexAddress, notADigit } from './adapter-capabilities';
 import { toHexStringWithRadixMarker, VariableRange } from '../../common/memory-range';
 import { sendRequest } from '../../common/debug-requests';
 
@@ -42,8 +42,9 @@ export class CTracker extends AdapterVariableTracker {
             return undefined;
         }
         try {
+            const specifiedAddress = findHexAddress(variable.memoryReference);
             const [variableAddress, variableSize] = await Promise.all([
-                variable.memoryReference && hexAddress.test(variable.memoryReference) ? variable.memoryReference : this.getAddressOfVariable(variable.name, session),
+                specifiedAddress ?? this.getAddressOfVariable(variable.name, session),
                 this.getSizeOfVariable(variable.name, session)
             ]);
             if (!variableAddress) { return undefined; }
@@ -66,8 +67,7 @@ export class CTracker extends AdapterVariableTracker {
 
     async getAddressOfVariable(variableName: string, session: vscode.DebugSession): Promise<string | undefined> {
         const response = await sendRequest(session, 'evaluate', { expression: CEvaluateExpression.addressOf(variableName), context: 'watch', frameId: this.currentFrame });
-        const addressPart = hexAddress.exec(response.result);
-        return addressPart ? addressPart[0] : undefined;
+        return findHexAddress(response.result);
     }
 
     async getSizeOfVariable(variableName: string, session: vscode.DebugSession): Promise<bigint | undefined> {