@theia/memory-inspector 1.45.1 → 1.46.0-next.72

package/src/browser/wrapper-widgets/memory-dock-panel.ts

@@ -1,51 +1,51 @@
-/********************************************************************************
- * Copyright (C) 2019 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 { DockPanelRendererFactory } from '@theia/core/lib/browser';
-import { TheiaDockPanel } from '@theia/core/lib/browser/shell/theia-dock-panel';
-import { interfaces } from '@theia/core/shared/inversify';
-
-export class MemoryDockPanel extends TheiaDockPanel {
-    override toggleMaximized(): void { /* don't */ }
-}
-
-export namespace MemoryDockPanel {
-    export const ID = 'memory-dock-panel-widget';
-    const DOCK_PANEL_ID = 'theia-main-content-panel';
-    const THEIA_TABBAR_CLASSES = ['theia-app-centers', 'theia-app-main'];
-    const MEMORY_INSPECTOR_TABBAR_CLASS = 'memory-dock-tabbar';
-    const DOCK_PANEL_CLASS = 'memory-dock-panel';
-
-    const createDockPanel = (factory: DockPanelRendererFactory): MemoryDockPanel => {
-        const renderer = factory();
-        renderer.tabBarClasses.push(...THEIA_TABBAR_CLASSES, MEMORY_INSPECTOR_TABBAR_CLASS);
-        const dockPanel = new MemoryDockPanel({
-            mode: 'multiple-document',
-            renderer,
-            spacing: 0,
-        });
-        dockPanel.addClass(DOCK_PANEL_CLASS);
-        dockPanel.id = DOCK_PANEL_ID;
-
-        return dockPanel;
-    };
-
-    export const createWidget = (parent: interfaces.Container): MemoryDockPanel => {
-        const dockFactory = parent.get<DockPanelRendererFactory>(DockPanelRendererFactory);
-        const dockPanel = createDockPanel(dockFactory);
-        return dockPanel;
-    };
-}
+/********************************************************************************
+ * Copyright (C) 2019 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 { DockPanelRendererFactory } from '@theia/core/lib/browser';
+import { TheiaDockPanel } from '@theia/core/lib/browser/shell/theia-dock-panel';
+import { interfaces } from '@theia/core/shared/inversify';
+
+export class MemoryDockPanel extends TheiaDockPanel {
+    override toggleMaximized(): void { /* don't */ }
+}
+
+export namespace MemoryDockPanel {
+    export const ID = 'memory-dock-panel-widget';
+    const DOCK_PANEL_ID = 'theia-main-content-panel';
+    const THEIA_TABBAR_CLASSES = ['theia-app-centers', 'theia-app-main'];
+    const MEMORY_INSPECTOR_TABBAR_CLASS = 'memory-dock-tabbar';
+    const DOCK_PANEL_CLASS = 'memory-dock-panel';
+
+    const createDockPanel = (factory: DockPanelRendererFactory): MemoryDockPanel => {
+        const renderer = factory();
+        renderer.tabBarClasses.push(...THEIA_TABBAR_CLASSES, MEMORY_INSPECTOR_TABBAR_CLASS);
+        const dockPanel = new MemoryDockPanel({
+            mode: 'multiple-document',
+            renderer,
+            spacing: 0,
+        });
+        dockPanel.addClass(DOCK_PANEL_CLASS);
+        dockPanel.id = DOCK_PANEL_ID;
+
+        return dockPanel;
+    };
+
+    export const createWidget = (parent: interfaces.Container): MemoryDockPanel => {
+        const dockFactory = parent.get<DockPanelRendererFactory>(DockPanelRendererFactory);
+        const dockPanel = createDockPanel(dockFactory);
+        return dockPanel;
+    };
+}

package/src/browser/wrapper-widgets/memory-dockpanel-placeholder-widget.tsx

@@ -1,38 +1,38 @@
-/********************************************************************************
- * 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 { ReactWidget } from '@theia/core/lib/browser';
-import { injectable, postConstruct } from '@theia/core/shared/inversify';
-import * as React from '@theia/core/shared/react';
-
-@injectable()
-export class MemoryDockpanelPlaceholder extends ReactWidget {
-    static ID = 'memory-dockpanel-placeholder';
-
-    @postConstruct()
-    init(): void {
-        this.id = MemoryDockpanelPlaceholder.ID;
-        this.addClass(MemoryDockpanelPlaceholder.ID);
-        this.update();
-    }
-
-    render(): React.ReactNode {
-        return (
-            <div className='t-mv-memory-fetch-error'>
-                Click the <i className='memory-view-icon toolbar' /> icon to add a new memory view or the <i className='register-view-icon toolbar' /> icon to add a register view.
-            </div>
-        );
-    }
-}
+/********************************************************************************
+ * 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 { ReactWidget } from '@theia/core/lib/browser';
+import { injectable, postConstruct } from '@theia/core/shared/inversify';
+import * as React from '@theia/core/shared/react';
+
+@injectable()
+export class MemoryDockpanelPlaceholder extends ReactWidget {
+    static ID = 'memory-dockpanel-placeholder';
+
+    @postConstruct()
+    init(): void {
+        this.id = MemoryDockpanelPlaceholder.ID;
+        this.addClass(MemoryDockpanelPlaceholder.ID);
+        this.update();
+    }
+
+    render(): React.ReactNode {
+        return (
+            <div className='t-mv-memory-fetch-error'>
+                Click the <i className='memory-view-icon toolbar' /> icon to add a new memory view or the <i className='register-view-icon toolbar' /> icon to add a register view.
+            </div>
+        );
+    }
+}

package/src/browser/wrapper-widgets/memory-layout-widget.tsx

@@ -1,167 +1,167 @@
-/********************************************************************************
- * 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 { Disposable, DisposableCollection, Emitter, nls } from '@theia/core';
-import { ApplicationShell, Message, Panel, Widget, WidgetManager } from '@theia/core/lib/browser';
-import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
-import { MemoryDiffSelectWidget } from '../diff-widget/memory-diff-select-widget';
-import { MemoryWidget } from '../memory-widget/memory-widget';
-import { MemoryWidgetManager } from '../utils/memory-widget-manager';
-import { MemoryDockPanel } from './memory-dock-panel';
-import { MemoryDockpanelPlaceholder } from './memory-dockpanel-placeholder-widget';
-
-@injectable()
-export class MemoryLayoutWidget extends Panel implements Disposable, ApplicationShell.TrackableWidgetProvider {
-    static readonly ID = 'memory-layout-widget';
-    static readonly LABEL = nls.localize('theia/memory-inspector/memoryInspector', 'Memory Inspector');
-
-    // Necessary to inherit theia's tabbar styling
-    static readonly DOCK_PANEL_ID = 'theia-main-content-panel';
-    static readonly THEIA_TABBAR_CLASSES = ['theia-app-centers', 'theia-app-main'];
-    static readonly MEMORY_INSPECTOR_TABBAR_CLASS = 'memory-dock-tabbar';
-    static readonly DOCK_PANEL_CLASS = 'memory-dock-panel';
-
-    @inject(WidgetManager) protected readonly widgetManager: WidgetManager;
-    @inject(MemoryWidgetManager) protected readonly memoryWidgetManager: MemoryWidgetManager;
-    @inject(MemoryDiffSelectWidget) protected readonly diffSelectWidget: MemoryDiffSelectWidget;
-    @inject(MemoryDockpanelPlaceholder) protected readonly placeholderWidget: MemoryDockpanelPlaceholder;
-    @inject(ApplicationShell) protected readonly shell: ApplicationShell;
-
-    protected readonly onDidChangeTrackableWidgetsEmitter = new Emitter<Widget[]>();
-    readonly onDidChangeTrackableWidgets = this.onDidChangeTrackableWidgetsEmitter.event;
-
-    protected readonly toDispose = new DisposableCollection();
-    protected dockPanel: MemoryDockPanel;
-    protected hasGeneratedWidgetAutomatically = false;
-
-    @postConstruct()
-    protected init(): void {
-        this.doInit();
-    }
-
-    protected async doInit(): Promise<void> {
-        this.id = MemoryLayoutWidget.ID;
-        this.addClass(MemoryLayoutWidget.ID);
-        this.title.label = MemoryLayoutWidget.LABEL;
-        this.title.caption = MemoryLayoutWidget.LABEL;
-        this.title.closable = true;
-        this.title.iconClass = 'memory-view-icon';
-        this.dockPanel = await this.widgetManager.getOrCreateWidget<MemoryDockPanel>(MemoryDockPanel.ID);
-        this.addWidget(this.dockPanel);
-        this.addWidget(this.diffSelectWidget);
-        this.addWidget(this.placeholderWidget);
-        this.toDispose.push(this.memoryWidgetManager.onDidCreateNewWidget(widget => {
-            this.dockPanel.addWidget(widget);
-            this.dockPanel.activateWidget(widget);
-            this.onDidChangeTrackableWidgetsEmitter.fire([widget]);
-        }));
-        this.toDispose.push(this.memoryWidgetManager.onChanged(() => {
-            if (!this.memoryWidgetManager.canCompare) {
-                this.diffSelectWidget.hide();
-            }
-        }));
-        this.dockPanel.widgetRemoved.connect(this.handleWidgetRemoved.bind(this), this);
-        this.dockPanel.widgetAdded.connect(this.handleWidgetsChanged.bind(this), this);
-        this.toDispose.push(this.onDidChangeTrackableWidgetsEmitter);
-        this.diffSelectWidget.hide();
-        this.update();
-    }
-
-    toggleComparisonVisibility(): void {
-        if (this.diffSelectWidget.isHidden) {
-            this.diffSelectWidget.show();
-        } else {
-            this.diffSelectWidget.hide();
-        }
-        this.update();
-    }
-
-    override dispose(): void {
-        this.toDispose.dispose();
-        super.dispose();
-    }
-
-    protected dockPanelHoldsWidgets(): boolean {
-        const iter = this.dockPanel.tabBars();
-        let tabBar = iter.next();
-        while (tabBar) {
-            if (tabBar.titles.length) {
-                return true;
-            }
-            tabBar = iter.next();
-        }
-        return false;
-    }
-
-    protected handleWidgetsChanged(): void {
-        if (this.dockPanelHoldsWidgets()) {
-            this.placeholderWidget.hide();
-        } else {
-            this.placeholderWidget.show();
-        }
-    }
-
-    protected handleWidgetRemoved(_sender: Widget, widgetRemoved: Widget): void {
-        if (widgetRemoved instanceof MemoryWidget) { // Sometimes it's the tabbar.
-            this.handleWidgetsChanged();
-            this.shell.activateWidget(this.id);
-        }
-    }
-
-    protected async createAndFocusWidget(): Promise<void> {
-        const widget = await this.memoryWidgetManager.createNewMemoryWidget();
-        widget.activate();
-    }
-
-    protected override async onAfterShow(msg: Message): Promise<void> {
-        if (!this.hasGeneratedWidgetAutomatically && !this.dockPanelHoldsWidgets()) {
-            await this.createAndFocusWidget();
-            this.hasGeneratedWidgetAutomatically = true;
-        }
-        super.onAfterShow(msg);
-    }
-
-    getTrackableWidgets(): Widget[] {
-        const children: Widget[] = [];
-        const childIterator = this.dockPanel.children();
-        let currentChild = childIterator.next();
-        while (currentChild) {
-            children.push(currentChild);
-            currentChild = childIterator.next();
-        }
-        return children;
-    }
-
-    activateWidget(id: string): Widget | undefined {
-        const widget = this.getTrackableWidgets().find(candidateWidget => candidateWidget.id === id);
-        if (widget) {
-            this.dockPanel.activateWidget(widget);
-        }
-        return widget;
-    }
-
-    override onActivateRequest(msg: Message): void {
-        const displayedWidget = this.dockPanel.currentTabBar?.currentTitle?.owner;
-        if (displayedWidget) {
-            displayedWidget.activate();
-        } else {
-            // Only happens if you remove all widgets, then close the view.
-            this.node.tabIndex = -1;
-            this.node.focus();
-        }
-        super.onActivateRequest(msg);
-    }
-}
+/********************************************************************************
+ * 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 { Disposable, DisposableCollection, Emitter, nls } from '@theia/core';
+import { ApplicationShell, Message, Panel, Widget, WidgetManager } from '@theia/core/lib/browser';
+import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import { MemoryDiffSelectWidget } from '../diff-widget/memory-diff-select-widget';
+import { MemoryWidget } from '../memory-widget/memory-widget';
+import { MemoryWidgetManager } from '../utils/memory-widget-manager';
+import { MemoryDockPanel } from './memory-dock-panel';
+import { MemoryDockpanelPlaceholder } from './memory-dockpanel-placeholder-widget';
+
+@injectable()
+export class MemoryLayoutWidget extends Panel implements Disposable, ApplicationShell.TrackableWidgetProvider {
+    static readonly ID = 'memory-layout-widget';
+    static readonly LABEL = nls.localize('theia/memory-inspector/memoryInspector', 'Memory Inspector');
+
+    // Necessary to inherit theia's tabbar styling
+    static readonly DOCK_PANEL_ID = 'theia-main-content-panel';
+    static readonly THEIA_TABBAR_CLASSES = ['theia-app-centers', 'theia-app-main'];
+    static readonly MEMORY_INSPECTOR_TABBAR_CLASS = 'memory-dock-tabbar';
+    static readonly DOCK_PANEL_CLASS = 'memory-dock-panel';
+
+    @inject(WidgetManager) protected readonly widgetManager: WidgetManager;
+    @inject(MemoryWidgetManager) protected readonly memoryWidgetManager: MemoryWidgetManager;
+    @inject(MemoryDiffSelectWidget) protected readonly diffSelectWidget: MemoryDiffSelectWidget;
+    @inject(MemoryDockpanelPlaceholder) protected readonly placeholderWidget: MemoryDockpanelPlaceholder;
+    @inject(ApplicationShell) protected readonly shell: ApplicationShell;
+
+    protected readonly onDidChangeTrackableWidgetsEmitter = new Emitter<Widget[]>();
+    readonly onDidChangeTrackableWidgets = this.onDidChangeTrackableWidgetsEmitter.event;
+
+    protected readonly toDispose = new DisposableCollection();
+    protected dockPanel: MemoryDockPanel;
+    protected hasGeneratedWidgetAutomatically = false;
+
+    @postConstruct()
+    protected init(): void {
+        this.doInit();
+    }
+
+    protected async doInit(): Promise<void> {
+        this.id = MemoryLayoutWidget.ID;
+        this.addClass(MemoryLayoutWidget.ID);
+        this.title.label = MemoryLayoutWidget.LABEL;
+        this.title.caption = MemoryLayoutWidget.LABEL;
+        this.title.closable = true;
+        this.title.iconClass = 'memory-view-icon';
+        this.dockPanel = await this.widgetManager.getOrCreateWidget<MemoryDockPanel>(MemoryDockPanel.ID);
+        this.addWidget(this.dockPanel);
+        this.addWidget(this.diffSelectWidget);
+        this.addWidget(this.placeholderWidget);
+        this.toDispose.push(this.memoryWidgetManager.onDidCreateNewWidget(widget => {
+            this.dockPanel.addWidget(widget);
+            this.dockPanel.activateWidget(widget);
+            this.onDidChangeTrackableWidgetsEmitter.fire([widget]);
+        }));
+        this.toDispose.push(this.memoryWidgetManager.onChanged(() => {
+            if (!this.memoryWidgetManager.canCompare) {
+                this.diffSelectWidget.hide();
+            }
+        }));
+        this.dockPanel.widgetRemoved.connect(this.handleWidgetRemoved.bind(this), this);
+        this.dockPanel.widgetAdded.connect(this.handleWidgetsChanged.bind(this), this);
+        this.toDispose.push(this.onDidChangeTrackableWidgetsEmitter);
+        this.diffSelectWidget.hide();
+        this.update();
+    }
+
+    toggleComparisonVisibility(): void {
+        if (this.diffSelectWidget.isHidden) {
+            this.diffSelectWidget.show();
+        } else {
+            this.diffSelectWidget.hide();
+        }
+        this.update();
+    }
+
+    override dispose(): void {
+        this.toDispose.dispose();
+        super.dispose();
+    }
+
+    protected dockPanelHoldsWidgets(): boolean {
+        const iter = this.dockPanel.tabBars();
+        let tabBar = iter.next();
+        while (tabBar) {
+            if (tabBar.titles.length) {
+                return true;
+            }
+            tabBar = iter.next();
+        }
+        return false;
+    }
+
+    protected handleWidgetsChanged(): void {
+        if (this.dockPanelHoldsWidgets()) {
+            this.placeholderWidget.hide();
+        } else {
+            this.placeholderWidget.show();
+        }
+    }
+
+    protected handleWidgetRemoved(_sender: Widget, widgetRemoved: Widget): void {
+        if (widgetRemoved instanceof MemoryWidget) { // Sometimes it's the tabbar.
+            this.handleWidgetsChanged();
+            this.shell.activateWidget(this.id);
+        }
+    }
+
+    protected async createAndFocusWidget(): Promise<void> {
+        const widget = await this.memoryWidgetManager.createNewMemoryWidget();
+        widget.activate();
+    }
+
+    protected override async onAfterShow(msg: Message): Promise<void> {
+        if (!this.hasGeneratedWidgetAutomatically && !this.dockPanelHoldsWidgets()) {
+            await this.createAndFocusWidget();
+            this.hasGeneratedWidgetAutomatically = true;
+        }
+        super.onAfterShow(msg);
+    }
+
+    getTrackableWidgets(): Widget[] {
+        const children: Widget[] = [];
+        const childIterator = this.dockPanel.children();
+        let currentChild = childIterator.next();
+        while (currentChild) {
+            children.push(currentChild);
+            currentChild = childIterator.next();
+        }
+        return children;
+    }
+
+    activateWidget(id: string): Widget | undefined {
+        const widget = this.getTrackableWidgets().find(candidateWidget => candidateWidget.id === id);
+        if (widget) {
+            this.dockPanel.activateWidget(widget);
+        }
+        return widget;
+    }
+
+    override onActivateRequest(msg: Message): void {
+        const displayedWidget = this.dockPanel.currentTabBar?.currentTitle?.owner;
+        if (displayedWidget) {
+            displayedWidget.activate();
+        } else {
+            // Only happens if you remove all widgets, then close the view.
+            this.node.tabIndex = -1;
+            this.node.focus();
+        }
+        super.onActivateRequest(msg);
+    }
+}

package/src/common/util.ts

@@ -1,28 +1,28 @@
-/********************************************************************************
- * Copyright (C) 2019 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 * as Long from 'long';
-
-/**
- * Parse `hexStr` as an hexadecimal string (with or without the leading 0x)
- * and return the value as a Long.
- */
-export function hexStrToUnsignedLong(hexStr: string): Long {
-    if (hexStr.trim().length === 0) {
-        return new Long(0, 0, true);
-    }
-    return Long.fromString(hexStr, true, 16);
-}
+/********************************************************************************
+ * Copyright (C) 2019 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 * as Long from 'long';
+
+/**
+ * Parse `hexStr` as an hexadecimal string (with or without the leading 0x)
+ * and return the value as a Long.
+ */
+export function hexStrToUnsignedLong(hexStr: string): Long {
+    if (hexStr.trim().length === 0) {
+        return new Long(0, 0, true);
+    }
+    return Long.fromString(hexStr, true, 16);
+}