Merge branch 'main' into session-support

thegecko · thegecko · commit 1d796f63393b · 2025-01-09T12:34:25.000Z
diff --git a/src/plugin/memory-webview-main.ts b/src/plugin/memory-webview-main.ts
@@ -174,14 +174,14 @@ export class MemoryWebview implements vscode.CustomReadonlyEditorProvider {
         }
 
         // Set HTML content
-        await this.getWebviewContent(panel);
+        await this.getWebviewContent(panel, initialMemory);
 
         // Sets up an event listener to listen for messages passed from the webview view context
         // and executes code based on the message that is received
         this.setWebviewMessageListener(panel, initialMemory);
     }
 
-    protected async getWebviewContent(panel: vscode.WebviewPanel): Promise<void> {
+    protected async getWebviewContent(panel: vscode.WebviewPanel, initialMemory?: MemoryOptions): Promise<void> {
         const mainUri = panel.webview.asWebviewUri(vscode.Uri.joinPath(
             this.extensionUri,
             'dist',
@@ -205,7 +205,7 @@ export class MemoryWebview implements vscode.CustomReadonlyEditorProvider {
                     <link href="${memoryInspectorCSS}" rel="stylesheet" />
                 </head>
                 <body>
-                    <div id='root'></div>
+                    <div id='root'></div>${initialMemory ? `<div id='initial-data' data-options='${JSON.stringify(initialMemory)}'></div>` : ''}
                 </body>
             </html>
         `;
@@ -334,7 +334,6 @@ export class MemoryWebview implements vscode.CustomReadonlyEditorProvider {
         this.setSession(participant, vscode.debug.activeDebugSession?.id);
         this.setSessions(participant, this.sessionTracker.getSessions());
         await this.setMemoryDisplaySettings(participant, panel.title);
-        this.refresh(participant, options);
     }
 
     protected async setSession(participant: WebviewIdMessageParticipant, sessionId: string | undefined): Promise<void> {
diff --git a/src/webview/memory-webview-view.tsx b/src/webview/memory-webview-view.tsx
@@ -90,12 +90,18 @@ export const DEFAULT_MEMORY_DISPLAY_CONFIGURATION: MemoryDisplaySettings = {
     visibleColumns: manifest.DEFAULT_VISIBLE_COLUMNS
 };
 
+function getInitialValuesHolder(): HTMLElement | null {
+    return document.getElementById('initial-data');
+}
+
 class App extends React.Component<{}, MemoryAppState> {
     protected memoryWidget = React.createRef<MemoryWidget>();
     protected refreshTimer?: NodeJS.Timeout | number;
 
     public constructor(props: {}) {
         super(props);
+        const initialValuesHolder = getInitialValuesHolder();
+        const initialReadArguments = initialValuesHolder ? { ...DEFAULT_READ_ARGUMENTS, ...JSON.parse(initialValuesHolder.dataset['options']!) } : DEFAULT_READ_ARGUMENTS;
         columnContributionService.register(new AddressColumn(), false);
         columnContributionService.register(new DataColumn(), false);
         columnContributionService.register(variableDecorator);
@@ -111,8 +117,8 @@ class App extends React.Component<{}, MemoryAppState> {
             sessionContext: DEFAULT_SESSION_CONTEXT,
             memory: undefined,
             effectiveAddressLength: 0,
-            configuredReadArguments: DEFAULT_READ_ARGUMENTS,
-            activeReadArguments: DEFAULT_READ_ARGUMENTS,
+            configuredReadArguments: initialReadArguments,
+            activeReadArguments: initialReadArguments,
             decorations: [],
             hoverService: hoverService,
             columns: columnContributionService.getColumns(),
@@ -123,6 +129,9 @@ class App extends React.Component<{}, MemoryAppState> {
     }
 
     public componentDidMount(): void {
+        if (getInitialValuesHolder()) {
+            this.fetchMemory(this.state.activeReadArguments);
+        }
         messenger.onRequest(setOptionsType, options => this.setOptions(options));
         messenger.onNotification(memoryWrittenType, writtenMemory => this.memoryWritten(writtenMemory));
         messenger.onNotification(sessionsChangedType, sessions => this.sessionsChanged(sessions));
