@theia/memory-inspector 1.53.0-next.5 → 1.53.0-next.55

package/README.md

@@ -1,71 +1,71 @@
-<div align='center'>
-
-<br />
-
-<img src='https://raw.githubusercontent.com/eclipse-theia/theia/master/logo/theia.svg?sanitize=true' alt='theia-ext-logo' width='100px' />
-
-<h2>ECLIPSE THEIA - MEMORY-INSPECTOR EXTENSION</h2>
-
-<hr />
-
-</div>
-
-## Description
-
-This extension contributes a set of widgets for viewing memory in different ways.
-
-## Requirements
-
-This extension must be used in conjunction with a Debug Adapter that implements a `ReadMemoryRequest` handler or alternative custom request that returns memory data.
-It has been tested against the [CDT-GDB Adapter](https://github.com/eclipse-cdt/cdt-gdb-adapter) used as the backend for the
-[CDT-GDB VSCode](https://github.com/eclipse-cdt/cdt-gdb-vscode) plugin. This repository is configured to download that plugin as part of its build routine.
-If you intend to use this extension with a different debug adapter, you may need to implement a custom
-[`MemoryProvider`](./src/browser/memory-provider/memory-provider-service.ts) to handle any peculiarities of the requests and responses used by your adapter.
-
-## Widgets
-
-### Memory Widget
-
-The basic [`MemoryWidget` class](./src/browser/memory-widget/memory-widget.ts) is a wrapper around two functional widgets, a `MemoryOptionsWidget` and
-a`MemoryTableWidget`. The [`MemoryOptionsWidget`](./src/browser/memory-widget/memory-options-widget.tsx) is responsible for configuring the display
-and fetching memory, and the [`MemoryTableWidget`](./src/browser/memory-widget/memory-table-widget.tsx) renders the memory according to the options
-specified by the user in the `MemoryOptionsWidget`. The basic combination of these three classes offers variable highlighting, ascii display, and
-dynamic updating in response to events from the debug session, as well as the option to lock the view to ignore changes from the session.
-
-### Diff Widget
-
-The [`MemoryDiffWidget`](./src/browser/diff-widget/memory-diff-widget-types.ts) is an elaboration of the `MemoryWidget` type that allows side-by-side
-comparison of the contents of two `MemoryWidgets`.
-
-### Register Widget
-
-The [`RegisterWidget`](./src/browser/register-widget/register-widget-types.ts) offers functionality to view and
-manipulate those values when using a debug adapter that reports register contents.
-
-### Editable Widget
-
-The [`MemoryEditableTableWidget`](./src/browser/editable-widget/memory-editable-table-widget.tsx) adds UI functionality to allow users to modify values in
-the table display and send them to a backend that supports that operation.
-
-## Using the Widgets
-
-The widgets are created by the [`MemoryWidgetManager`](./src/browser/utils/memory-widget-manager.ts), and modifying the `createNewMemoryWidget()`
-method of that service allows you to change what kind of widget is instantiated and under what circumstances. The widgets get memory through the
-[`MemoryProviderService`](./src/browser/memory-provider/memory-provider-service.ts), which delegates to implementations `MemoryProvider` interface
-that are bound as `MemoryProvider` contributions.
-
-
-## Additional Information
-
-- [API documentation for `@theia/getting-started`](https://eclipse-theia.github.io/theia/docs/next/modules/getting_started.html)
-- [Theia - GitHub](https://github.com/eclipse-theia/theia)
-- [Theia - Website](https://theia-ide.org/)
-
-## License
-
-- [Eclipse Public License 2.0](http://www.eclipse.org/legal/epl-2.0/)
-- [一 (Secondary) GNU General Public License, version 2 with the GNU Classpath Exception](https://projects.eclipse.org/license/secondary-gpl-2.0-cp)
-
-## Trademark
-"Theia" is a trademark of the Eclipse Foundation
-https://www.eclipse.org/theia
+<div align='center'>
+
+<br />
+
+<img src='https://raw.githubusercontent.com/eclipse-theia/theia/master/logo/theia.svg?sanitize=true' alt='theia-ext-logo' width='100px' />
+
+<h2>ECLIPSE THEIA - MEMORY-INSPECTOR EXTENSION</h2>
+
+<hr />
+
+</div>
+
+## Description
+
+This extension contributes a set of widgets for viewing memory in different ways.
+
+## Requirements
+
+This extension must be used in conjunction with a Debug Adapter that implements a `ReadMemoryRequest` handler or alternative custom request that returns memory data.
+It has been tested against the [CDT-GDB Adapter](https://github.com/eclipse-cdt/cdt-gdb-adapter) used as the backend for the
+[CDT-GDB VSCode](https://github.com/eclipse-cdt/cdt-gdb-vscode) plugin. This repository is configured to download that plugin as part of its build routine.
+If you intend to use this extension with a different debug adapter, you may need to implement a custom
+[`MemoryProvider`](./src/browser/memory-provider/memory-provider-service.ts) to handle any peculiarities of the requests and responses used by your adapter.
+
+## Widgets
+
+### Memory Widget
+
+The basic [`MemoryWidget` class](./src/browser/memory-widget/memory-widget.ts) is a wrapper around two functional widgets, a `MemoryOptionsWidget` and
+a`MemoryTableWidget`. The [`MemoryOptionsWidget`](./src/browser/memory-widget/memory-options-widget.tsx) is responsible for configuring the display
+and fetching memory, and the [`MemoryTableWidget`](./src/browser/memory-widget/memory-table-widget.tsx) renders the memory according to the options
+specified by the user in the `MemoryOptionsWidget`. The basic combination of these three classes offers variable highlighting, ascii display, and
+dynamic updating in response to events from the debug session, as well as the option to lock the view to ignore changes from the session.
+
+### Diff Widget
+
+The [`MemoryDiffWidget`](./src/browser/diff-widget/memory-diff-widget-types.ts) is an elaboration of the `MemoryWidget` type that allows side-by-side
+comparison of the contents of two `MemoryWidgets`.
+
+### Register Widget
+
+The [`RegisterWidget`](./src/browser/register-widget/register-widget-types.ts) offers functionality to view and
+manipulate those values when using a debug adapter that reports register contents.
+
+### Editable Widget
+
+The [`MemoryEditableTableWidget`](./src/browser/editable-widget/memory-editable-table-widget.tsx) adds UI functionality to allow users to modify values in
+the table display and send them to a backend that supports that operation.
+
+## Using the Widgets
+
+The widgets are created by the [`MemoryWidgetManager`](./src/browser/utils/memory-widget-manager.ts), and modifying the `createNewMemoryWidget()`
+method of that service allows you to change what kind of widget is instantiated and under what circumstances. The widgets get memory through the
+[`MemoryProviderService`](./src/browser/memory-provider/memory-provider-service.ts), which delegates to implementations `MemoryProvider` interface
+that are bound as `MemoryProvider` contributions.
+
+
+## Additional Information
+
+- [API documentation for `@theia/getting-started`](https://eclipse-theia.github.io/theia/docs/next/modules/getting_started.html)
+- [Theia - GitHub](https://github.com/eclipse-theia/theia)
+- [Theia - Website](https://theia-ide.org/)
+
+## License
+
+- [Eclipse Public License 2.0](http://www.eclipse.org/legal/epl-2.0/)
+- [一 (Secondary) GNU General Public License, version 2 with the GNU Classpath Exception](https://projects.eclipse.org/license/secondary-gpl-2.0-cp)
+
+## Trademark
+"Theia" is a trademark of the Eclipse Foundation
+https://www.eclipse.org/theia

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theia/memory-inspector",
-  "version": "1.53.0-next.5+1e5fb536d",
+  "version": "1.53.0-next.55+d1a989a68c",
   "description": "Theia - Memory Inspector",
   "keywords": [
     "theia-extension"
@@ -27,8 +27,8 @@
     "watch": "theiaext watch"
   },
   "dependencies": {
-    "@theia/core": "1.53.0-next.5+1e5fb536d",
-    "@theia/debug": "1.53.0-next.5+1e5fb536d",
+    "@theia/core": "1.53.0-next.55+d1a989a68c",
+    "@theia/debug": "1.53.0-next.55+d1a989a68c",
     "@vscode/debugprotocol": "^1.51.0",
     "long": "^4.0.0",
     "tslib": "^2.6.2"
@@ -44,5 +44,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1e5fb536d65550ad8fa0fefcec731645b2afc74a"
+  "gitHead": "d1a989a68c1b5ec1f9098e9126653c6346844769"
 }

package/src/browser/diff-widget/memory-diff-options-widget.tsx

@@ -1,152 +1,152 @@
-/********************************************************************************
- * Copyright (C) 2021 Ericsson and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
- ********************************************************************************/
-
-import { Key, KeyCode } from '@theia/core/lib/browser';
-import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
-import * as React from '@theia/core/shared/react';
-import { ThemeType } from '@theia/core/lib/common/theme';
-import { LENGTH_FIELD_ID, LOCATION_OFFSET_FIELD_ID, MemoryOptionsWidget } from '../memory-widget/memory-options-widget';
-import { MWInput } from '../utils/memory-widget-components';
-import { Interfaces, MemoryDiffWidgetData, Utils } from '../utils/memory-widget-utils';
-import { DiffLabels } from './memory-diff-widget-types';
-import { nls } from '@theia/core/lib/common/nls';
-
-export interface DiffMemoryOptions extends Interfaces.MemoryOptions {
-    beforeOffset: number;
-    afterOffset: number;
-}
-
-@injectable()
-export class MemoryDiffOptionsWidget extends MemoryOptionsWidget {
-    @inject(MemoryDiffWidgetData) protected override memoryWidgetOptions: MemoryDiffWidgetData;
-
-    protected themeType: ThemeType;
-
-    override get options(): DiffMemoryOptions {
-        return this.storeState();
-    }
-
-    updateDiffData(newDiffData: Partial<MemoryDiffWidgetData>): void {
-        this.memoryWidgetOptions = { ...this.memoryWidgetOptions, ...newDiffData };
-        this.init();
-    }
-
-    @postConstruct()
-    protected override init(): void {
-        this.addClass(MemoryOptionsWidget.ID);
-        this.addClass('diff-options-widget');
-        const { identifier, beforeBytes, afterBytes } = this.memoryWidgetOptions;
-
-        this.id = `${MemoryDiffOptionsWidget.ID}-${identifier}`;
-        this.title.label = nls.localize('theia/memory-inspector/diff/label', 'Diff: {0}', identifier);
-        this.title.caption = this.title.label;
-        this.title.iconClass = this.iconClass;
-        this.title.closable = true;
-
-        this.toDispose.push(this.onOptionsChanged(() => this.update()));
-
-        beforeBytes.label = DiffLabels.Before;
-        afterBytes.label = DiffLabels.After;
-
-        this.columnsDisplayed = {
-            beforeAddress: {
-                label: nls.localizeByDefault('Address'),
-                doRender: true
-            },
-            beforeData: {
-                label: this.memoryWidgetOptions.titles[0],
-                doRender: true
-            },
-            afterAddress: {
-                label: nls.localizeByDefault('Address'),
-                doRender: true
-            },
-            afterData: {
-                label: this.memoryWidgetOptions.titles[1],
-                doRender: true
-            },
-            variables: {
-                label: nls.localizeByDefault('Variables'),
-                doRender: false
-            },
-            ascii: {
-                label: nls.localize('theia/memory-inspector/ascii', 'ASCII'),
-                doRender: false
-            },
-        };
-
-        this.update();
-    }
-
-    protected override acceptFocus(): void {
-        const settingsCog = this.node.querySelector('.toggle-settings-click-zone') as HTMLDivElement;
-        settingsCog?.focus();
-    }
-
-    protected override renderMemoryLocationGroup(): React.ReactNode {
-        const { titles: [beforeTitle, afterTitle] } = this.memoryWidgetOptions;
-        return (
-            <div className='t-mv-group view-group'>
-                <MWInput
-                    id={LOCATION_OFFSET_FIELD_ID}
-                    label={nls.localize('theia/memory-inspector/diff-widget/offset-label', '{0} Offset', beforeTitle)}
-                    title={nls.localize('theia/memory-inspector/diff-widget/offset-title', 'Bytes to offset the memory from {0}', beforeTitle)}
-                    defaultValue='0'
-                    passRef={this.assignOffsetRef}
-                    onChange={Utils.validateNumericalInputs}
-                    onKeyDown={this.doRefresh}
-                />
-                <MWInput
-                    id={LENGTH_FIELD_ID}
-                    label={nls.localize('theia/memory-inspector/diff-widget/offset-label', '{0} Offset', afterTitle)}
-                    title={nls.localize('theia/memory-inspector/diff-widget/offset-title', 'Bytes to offset the memory from {0}', afterTitle)}
-                    defaultValue='0'
-                    passRef={this.assignReadLengthRef}
-                    onChange={Utils.validateNumericalInputs}
-                    onKeyDown={this.doRefresh}
-                />
-                <button
-                    type='button'
-                    className='theia-button main view-group-go-button'
-                    title={nls.localizeByDefault('Go')}
-                    onClick={this.doRefresh}
-                >
-                    {nls.localizeByDefault('Go')}
-                </button>
-            </div>
-        );
-    }
-
-    protected override getObligatoryColumnIds(): string[] {
-        return ['beforeAddress', 'beforeData', 'afterAddress', 'afterData'];
-    }
-
-    protected override doRefresh = (event: React.KeyboardEvent<HTMLInputElement> | React.MouseEvent<HTMLButtonElement, MouseEvent>): void => {
-        if ('key' in event && KeyCode.createKeyCode(event.nativeEvent).key?.keyCode !== Key.ENTER.keyCode) {
-            return;
-        }
-        this.fireDidChangeOptions();
-    };
-
-    override storeState(): DiffMemoryOptions {
-        return {
-            ...super.storeState(),
-            // prefix a 0. It'll do nothing if it's a number, but if it's an empty string or garbage, it'll make parseInt return 0.
-            beforeOffset: parseInt(`0${this.offsetField?.value ?? 0}`),
-            afterOffset: parseInt(`0${this.readLengthField?.value ?? 0}`),
-        };
-    }
-}
+/********************************************************************************
+ * Copyright (C) 2021 Ericsson and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+ ********************************************************************************/
+
+import { Key, KeyCode } from '@theia/core/lib/browser';
+import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import * as React from '@theia/core/shared/react';
+import { ThemeType } from '@theia/core/lib/common/theme';
+import { LENGTH_FIELD_ID, LOCATION_OFFSET_FIELD_ID, MemoryOptionsWidget } from '../memory-widget/memory-options-widget';
+import { MWInput } from '../utils/memory-widget-components';
+import { Interfaces, MemoryDiffWidgetData, Utils } from '../utils/memory-widget-utils';
+import { DiffLabels } from './memory-diff-widget-types';
+import { nls } from '@theia/core/lib/common/nls';
+
+export interface DiffMemoryOptions extends Interfaces.MemoryOptions {
+    beforeOffset: number;
+    afterOffset: number;
+}
+
+@injectable()
+export class MemoryDiffOptionsWidget extends MemoryOptionsWidget {
+    @inject(MemoryDiffWidgetData) protected override memoryWidgetOptions: MemoryDiffWidgetData;
+
+    protected themeType: ThemeType;
+
+    override get options(): DiffMemoryOptions {
+        return this.storeState();
+    }
+
+    updateDiffData(newDiffData: Partial<MemoryDiffWidgetData>): void {
+        this.memoryWidgetOptions = { ...this.memoryWidgetOptions, ...newDiffData };
+        this.init();
+    }
+
+    @postConstruct()
+    protected override init(): void {
+        this.addClass(MemoryOptionsWidget.ID);
+        this.addClass('diff-options-widget');
+        const { identifier, beforeBytes, afterBytes } = this.memoryWidgetOptions;
+
+        this.id = `${MemoryDiffOptionsWidget.ID}-${identifier}`;
+        this.title.label = nls.localize('theia/memory-inspector/diff/label', 'Diff: {0}', identifier);
+        this.title.caption = this.title.label;
+        this.title.iconClass = this.iconClass;
+        this.title.closable = true;
+
+        this.toDispose.push(this.onOptionsChanged(() => this.update()));
+
+        beforeBytes.label = DiffLabels.Before;
+        afterBytes.label = DiffLabels.After;
+
+        this.columnsDisplayed = {
+            beforeAddress: {
+                label: nls.localizeByDefault('Address'),
+                doRender: true
+            },
+            beforeData: {
+                label: this.memoryWidgetOptions.titles[0],
+                doRender: true
+            },
+            afterAddress: {
+                label: nls.localizeByDefault('Address'),
+                doRender: true
+            },
+            afterData: {
+                label: this.memoryWidgetOptions.titles[1],
+                doRender: true
+            },
+            variables: {
+                label: nls.localizeByDefault('Variables'),
+                doRender: false
+            },
+            ascii: {
+                label: nls.localize('theia/memory-inspector/ascii', 'ASCII'),
+                doRender: false
+            },
+        };
+
+        this.update();
+    }
+
+    protected override acceptFocus(): void {
+        const settingsCog = this.node.querySelector('.toggle-settings-click-zone') as HTMLDivElement;
+        settingsCog?.focus();
+    }
+
+    protected override renderMemoryLocationGroup(): React.ReactNode {
+        const { titles: [beforeTitle, afterTitle] } = this.memoryWidgetOptions;
+        return (
+            <div className='t-mv-group view-group'>
+                <MWInput
+                    id={LOCATION_OFFSET_FIELD_ID}
+                    label={nls.localize('theia/memory-inspector/diff-widget/offset-label', '{0} Offset', beforeTitle)}
+                    title={nls.localize('theia/memory-inspector/diff-widget/offset-title', 'Bytes to offset the memory from {0}', beforeTitle)}
+                    defaultValue='0'
+                    passRef={this.assignOffsetRef}
+                    onChange={Utils.validateNumericalInputs}
+                    onKeyDown={this.doRefresh}
+                />
+                <MWInput
+                    id={LENGTH_FIELD_ID}
+                    label={nls.localize('theia/memory-inspector/diff-widget/offset-label', '{0} Offset', afterTitle)}
+                    title={nls.localize('theia/memory-inspector/diff-widget/offset-title', 'Bytes to offset the memory from {0}', afterTitle)}
+                    defaultValue='0'
+                    passRef={this.assignReadLengthRef}
+                    onChange={Utils.validateNumericalInputs}
+                    onKeyDown={this.doRefresh}
+                />
+                <button
+                    type='button'
+                    className='theia-button main view-group-go-button'
+                    title={nls.localizeByDefault('Go')}
+                    onClick={this.doRefresh}
+                >
+                    {nls.localizeByDefault('Go')}
+                </button>
+            </div>
+        );
+    }
+
+    protected override getObligatoryColumnIds(): string[] {
+        return ['beforeAddress', 'beforeData', 'afterAddress', 'afterData'];
+    }
+
+    protected override doRefresh = (event: React.KeyboardEvent<HTMLInputElement> | React.MouseEvent<HTMLButtonElement, MouseEvent>): void => {
+        if ('key' in event && KeyCode.createKeyCode(event.nativeEvent).key?.keyCode !== Key.ENTER.keyCode) {
+            return;
+        }
+        this.fireDidChangeOptions();
+    };
+
+    override storeState(): DiffMemoryOptions {
+        return {
+            ...super.storeState(),
+            // prefix a 0. It'll do nothing if it's a number, but if it's an empty string or garbage, it'll make parseInt return 0.
+            beforeOffset: parseInt(`0${this.offsetField?.value ?? 0}`),
+            afterOffset: parseInt(`0${this.readLengthField?.value ?? 0}`),
+        };
+    }
+}