@theia/memory-inspector 1.34.1 → 1.34.3

package/src/browser/utils/memory-widget-variable-utils.ts

@@ -1,170 +1,170 @@
-/********************************************************************************
- * 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 WITH Classpath-exception-2.0
- ********************************************************************************/
-
-import { DebugScope, DebugVariable } from '@theia/debug/lib/browser/console/debug-console-items';
-import { DebugSession } from '@theia/debug/lib/browser/debug-session';
-import * as Long from 'long';
-
-export interface VariableRange {
-    name: string;
-    address: Long;
-    pastTheEndAddress: Long;
-    type?: string;
-    value?: string;
-}
-
-export interface VariableDecoration {
-    name: string;
-    color: string;
-    firstAppearance?: boolean;
-}
-
-export interface RegisterReadResult {
-    threadId: string | undefined;
-    registers: DebugVariable[];
-}
-
-export class VariableFinder {
-    protected readonly HIGH_CONTRAST_COLORS = [
-        'var(--theia-contrastActiveBorder)',
-        'var(--theia-contrastBorder)',
-    ];
-
-    protected readonly NON_HC_COLORS = [
-        'var(--theia-terminal-ansiBlue)',
-        'var(--theia-terminal-ansiGreen)',
-        'var(--theia-terminal-ansiRed)',
-        'var(--theia-terminal-ansiYellow)',
-        'var(--theia-terminal-ansiMagenta)',
-    ];
-
-    protected readonly variables: VariableRange[];
-    protected currentIndex = -1;
-    protected currentVariable: VariableRange | undefined = undefined;
-    protected handledVariables = new Map<string, Long>();
-    protected workingColors: string[];
-    protected lastCall = Long.MAX_UNSIGNED_VALUE;
-
-    constructor(variables: VariableRange[], highContrast = false) {
-        this.variables = variables.sort((a, b) => a.address.lessThan(b.address) ? -1 : 1);
-        this.workingColors = highContrast ? this.HIGH_CONTRAST_COLORS : this.NON_HC_COLORS;
-    }
-
-    /**
-     * @param address the address of interest.
-     *
-     * This function should be called with a sequence of addresses in increasing order
-     */
-    getVariableForAddress(address: Long): VariableDecoration | undefined {
-        if (address.lessThan(this.lastCall)) {
-            this.initialize(address);
-        }
-        this.lastCall = address;
-        if (this.currentVariable && address.greaterThanOrEqual(this.currentVariable.pastTheEndAddress)) {
-            this.currentIndex += 1;
-            this.currentVariable = this.variables[this.currentIndex];
-        }
-        if (!this.currentVariable) {
-            return undefined;
-        }
-        const { name } = this.currentVariable;
-        // const color = `hsl(${HSL_BASIS * this.currentIndex / this.variables.length}, 60%, 60%)`;
-        const color = this.workingColors[this.currentIndex % this.workingColors.length];
-        const decoration: VariableDecoration = {
-            name,
-            color,
-            firstAppearance: this.handledVariables.get(name) === address || !this.handledVariables.has(name),
-        };
-        if (address.greaterThanOrEqual(this.currentVariable.address) && address.lessThan(this.currentVariable.pastTheEndAddress)) {
-            this.handledVariables.set(name, address);
-            return decoration;
-        }
-        return undefined;
-    }
-
-    protected initialize(address: Long): void {
-        this.handledVariables.clear();
-        const firstCandidateIndex = this.variables.findIndex(variable => address.lessThan(variable.pastTheEndAddress));
-        if (firstCandidateIndex === -1) {
-            this.currentIndex = this.variables.length;
-        } else {
-            this.currentVariable = this.variables[firstCandidateIndex];
-            this.currentIndex = firstCandidateIndex;
-        }
-    }
-
-    searchForVariable(addressOrName: Long | string): VariableRange | undefined {
-        if (typeof addressOrName === 'string') {
-            return this.variables.find(variable => variable.name === addressOrName);
-        }
-        let upperLimit = this.variables.length - 1;
-        let lowerLimit = 0;
-        while (upperLimit >= lowerLimit) {
-            const target = Math.floor((lowerLimit + upperLimit) / 2);
-            const candidate = this.variables[target];
-            if (addressOrName >= candidate.address && addressOrName < candidate.pastTheEndAddress) {
-                return candidate;
-            }
-            if (addressOrName < candidate.address) {
-                upperLimit = target - 1;
-            }
-            if (addressOrName >= candidate.pastTheEndAddress) {
-                lowerLimit = target + 1;
-            }
-        }
-        return undefined;
-    }
-}
-
-/**
- * Get the Registers of the currently selected frame.
- */
-export async function getRegisters(session: DebugSession | undefined): Promise<DebugVariable[]> {
-    if (session === undefined) {
-        console.warn('No active debug session.');
-        return [];
-    }
-
-    const frame = session.currentFrame;
-    if (frame === undefined) {
-        throw new Error('No active stack frame.');
-    }
-
-    const registers: DebugVariable[] = [];
-
-    const scopes = await frame.getScopes();
-    const regScope = scopes.find(x => x.render() === 'Registers');
-    if (regScope !== undefined) {
-        const handleRegisterScope = async (scope: DebugVariable | DebugScope) => {
-            const variables = await scope.getElements();
-            for (const v of variables) {
-                if (v instanceof DebugVariable) {
-                    try {
-                        BigInt(v.value); // Make sure the value looks like a numerical value
-                        registers.push(v);
-                    } catch {
-                        handleRegisterScope(v);
-                    }
-                }
-            }
-        };
-        handleRegisterScope(regScope);
-    } else {
-        throw new Error('No Register scope in active stack frame.');
-    }
-    return registers;
-}
-
+/********************************************************************************
+ * 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 WITH Classpath-exception-2.0
+ ********************************************************************************/
+
+import { DebugScope, DebugVariable } from '@theia/debug/lib/browser/console/debug-console-items';
+import { DebugSession } from '@theia/debug/lib/browser/debug-session';
+import * as Long from 'long';
+
+export interface VariableRange {
+    name: string;
+    address: Long;
+    pastTheEndAddress: Long;
+    type?: string;
+    value?: string;
+}
+
+export interface VariableDecoration {
+    name: string;
+    color: string;
+    firstAppearance?: boolean;
+}
+
+export interface RegisterReadResult {
+    threadId: string | undefined;
+    registers: DebugVariable[];
+}
+
+export class VariableFinder {
+    protected readonly HIGH_CONTRAST_COLORS = [
+        'var(--theia-contrastActiveBorder)',
+        'var(--theia-contrastBorder)',
+    ];
+
+    protected readonly NON_HC_COLORS = [
+        'var(--theia-terminal-ansiBlue)',
+        'var(--theia-terminal-ansiGreen)',
+        'var(--theia-terminal-ansiRed)',
+        'var(--theia-terminal-ansiYellow)',
+        'var(--theia-terminal-ansiMagenta)',
+    ];
+
+    protected readonly variables: VariableRange[];
+    protected currentIndex = -1;
+    protected currentVariable: VariableRange | undefined = undefined;
+    protected handledVariables = new Map<string, Long>();
+    protected workingColors: string[];
+    protected lastCall = Long.MAX_UNSIGNED_VALUE;
+
+    constructor(variables: VariableRange[], highContrast = false) {
+        this.variables = variables.sort((a, b) => a.address.lessThan(b.address) ? -1 : 1);
+        this.workingColors = highContrast ? this.HIGH_CONTRAST_COLORS : this.NON_HC_COLORS;
+    }
+
+    /**
+     * @param address the address of interest.
+     *
+     * This function should be called with a sequence of addresses in increasing order
+     */
+    getVariableForAddress(address: Long): VariableDecoration | undefined {
+        if (address.lessThan(this.lastCall)) {
+            this.initialize(address);
+        }
+        this.lastCall = address;
+        if (this.currentVariable && address.greaterThanOrEqual(this.currentVariable.pastTheEndAddress)) {
+            this.currentIndex += 1;
+            this.currentVariable = this.variables[this.currentIndex];
+        }
+        if (!this.currentVariable) {
+            return undefined;
+        }
+        const { name } = this.currentVariable;
+        // const color = `hsl(${HSL_BASIS * this.currentIndex / this.variables.length}, 60%, 60%)`;
+        const color = this.workingColors[this.currentIndex % this.workingColors.length];
+        const decoration: VariableDecoration = {
+            name,
+            color,
+            firstAppearance: this.handledVariables.get(name) === address || !this.handledVariables.has(name),
+        };
+        if (address.greaterThanOrEqual(this.currentVariable.address) && address.lessThan(this.currentVariable.pastTheEndAddress)) {
+            this.handledVariables.set(name, address);
+            return decoration;
+        }
+        return undefined;
+    }
+
+    protected initialize(address: Long): void {
+        this.handledVariables.clear();
+        const firstCandidateIndex = this.variables.findIndex(variable => address.lessThan(variable.pastTheEndAddress));
+        if (firstCandidateIndex === -1) {
+            this.currentIndex = this.variables.length;
+        } else {
+            this.currentVariable = this.variables[firstCandidateIndex];
+            this.currentIndex = firstCandidateIndex;
+        }
+    }
+
+    searchForVariable(addressOrName: Long | string): VariableRange | undefined {
+        if (typeof addressOrName === 'string') {
+            return this.variables.find(variable => variable.name === addressOrName);
+        }
+        let upperLimit = this.variables.length - 1;
+        let lowerLimit = 0;
+        while (upperLimit >= lowerLimit) {
+            const target = Math.floor((lowerLimit + upperLimit) / 2);
+            const candidate = this.variables[target];
+            if (addressOrName >= candidate.address && addressOrName < candidate.pastTheEndAddress) {
+                return candidate;
+            }
+            if (addressOrName < candidate.address) {
+                upperLimit = target - 1;
+            }
+            if (addressOrName >= candidate.pastTheEndAddress) {
+                lowerLimit = target + 1;
+            }
+        }
+        return undefined;
+    }
+}
+
+/**
+ * Get the Registers of the currently selected frame.
+ */
+export async function getRegisters(session: DebugSession | undefined): Promise<DebugVariable[]> {
+    if (session === undefined) {
+        console.warn('No active debug session.');
+        return [];
+    }
+
+    const frame = session.currentFrame;
+    if (frame === undefined) {
+        throw new Error('No active stack frame.');
+    }
+
+    const registers: DebugVariable[] = [];
+
+    const scopes = await frame.getScopes();
+    const regScope = scopes.find(x => x.render() === 'Registers');
+    if (regScope !== undefined) {
+        const handleRegisterScope = async (scope: DebugVariable | DebugScope) => {
+            const variables = await scope.getElements();
+            for (const v of variables) {
+                if (v instanceof DebugVariable) {
+                    try {
+                        BigInt(v.value); // Make sure the value looks like a numerical value
+                        registers.push(v);
+                    } catch {
+                        handleRegisterScope(v);
+                    }
+                }
+            }
+        };
+        handleRegisterScope(regScope);
+    } else {
+        throw new Error('No Register scope in active stack frame.');
+    }
+    return registers;
+}
+

package/src/browser/utils/multi-select-bar.css

@@ -1,62 +1,62 @@
-/********************************************************************************
- * 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 WITH Classpath-exception-2.0
- ********************************************************************************/
-
-.multi-select-bar {
-    display: flex;
-    flex-flow: row nowrap;
-    user-select: none;
-    box-sizing: border-box;
-}
-
-.multi-select-checkbox-wrapper {
-    display: flex;
-    position: relative;
-    flex: auto;
-    text-align: center;
-}
-
-.multi-select-label {
-    height: 100%;
-    flex: auto;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border: 1px solid;
-    padding: 0 var(--theia-ui-padding);
-    background-color: var(--theia-editor-background);
-    border-color: var(--theia-dropdown-border);
-    box-sizing: border-box;
-}
-
-.multi-select-checkbox-wrapper input:checked ~ .multi-select-label {
-    background-color: var(--theia-input-background);
-    border-color: var(--theia-sideBar-foreground);
-    text-decoration: underline;
-    font-weight: bolder;
-}
-
-
-.multi-select-checkbox {
-    appearance: none;
-    -webkit-appearance: none;
-    position: absolute;
-    left: 0;
-    top: 0;
-    margin: 0;
-    height: 100%;
-    width: 100%;
-    cursor: pointer;
-}
+/********************************************************************************
+ * 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 WITH Classpath-exception-2.0
+ ********************************************************************************/
+
+.multi-select-bar {
+    display: flex;
+    flex-flow: row nowrap;
+    user-select: none;
+    box-sizing: border-box;
+}
+
+.multi-select-checkbox-wrapper {
+    display: flex;
+    position: relative;
+    flex: auto;
+    text-align: center;
+}
+
+.multi-select-label {
+    height: 100%;
+    flex: auto;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border: 1px solid;
+    padding: 0 var(--theia-ui-padding);
+    background-color: var(--theia-editor-background);
+    border-color: var(--theia-dropdown-border);
+    box-sizing: border-box;
+}
+
+.multi-select-checkbox-wrapper input:checked ~ .multi-select-label {
+    background-color: var(--theia-input-background);
+    border-color: var(--theia-sideBar-foreground);
+    text-decoration: underline;
+    font-weight: bolder;
+}
+
+
+.multi-select-checkbox {
+    appearance: none;
+    -webkit-appearance: none;
+    position: absolute;
+    left: 0;
+    top: 0;
+    margin: 0;
+    height: 100%;
+    width: 100%;
+    cursor: pointer;
+}

package/src/browser/utils/multi-select-bar.tsx

@@ -1,75 +1,75 @@
-/********************************************************************************
- * 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 WITH Classpath-exception-2.0
- ********************************************************************************/
-
-import * as React from '@theia/core/shared/react';
-import { MWLabel, MWLabelProps } from './memory-widget-components';
-
-export interface SingleSelectItemProps {
-    id: string;
-    label: string;
-    defaultChecked?: boolean;
-}
-interface MultiSelectBarProps {
-    items: SingleSelectItemProps[];
-    id?: string;
-    onSelectionChanged: (labelSelected: string, newSelectionState: boolean) => unknown;
-}
-
-export const MultiSelectBar: React.FC<MultiSelectBarProps> = ({ items, onSelectionChanged, id }) => {
-    const changeHandler: React.ChangeEventHandler<HTMLInputElement> = React.useCallback(e => {
-        onSelectionChanged(e.target.id, e.target.checked);
-    }, [onSelectionChanged]);
-
-    return (
-        <div className='multi-select-bar' id={id}>
-            {items.map(({ label, id: itemId, defaultChecked }) => (<LabeledCheckbox
-                label={label}
-                onChange={changeHandler}
-                defaultChecked={!!defaultChecked}
-                id={itemId}
-                key={`${label}-${id}-checkbox`}
-            />))}
-        </div>
-    );
-};
-
-interface LabeledCheckboxProps {
-    label: string;
-    id: string;
-    onChange: React.ChangeEventHandler;
-    defaultChecked: boolean;
-}
-
-const LabeledCheckbox: React.FC<LabeledCheckboxProps> = ({ defaultChecked, label, onChange, id }) => (
-    <div className='multi-select-checkbox-wrapper'>
-        <input
-            tabIndex={0}
-            type='checkbox'
-            id={id}
-            className='multi-select-checkbox'
-            defaultChecked={defaultChecked}
-            onChange={onChange}
-        />
-        <MWLabel id={id} label={label} classNames={['multi-select-label']} />
-    </div>
-);
-
-export const MWMultiSelect: React.FC<MWLabelProps & MultiSelectBarProps> = ({ id, label, disabled, items, onSelectionChanged }) => (
-    <>
-        <MWLabel id={id} label={label} disabled={disabled} />
-        <MultiSelectBar id={id} items={items} onSelectionChanged={onSelectionChanged} />
-    </>
-);
+/********************************************************************************
+ * 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 WITH Classpath-exception-2.0
+ ********************************************************************************/
+
+import * as React from '@theia/core/shared/react';
+import { MWLabel, MWLabelProps } from './memory-widget-components';
+
+export interface SingleSelectItemProps {
+    id: string;
+    label: string;
+    defaultChecked?: boolean;
+}
+interface MultiSelectBarProps {
+    items: SingleSelectItemProps[];
+    id?: string;
+    onSelectionChanged: (labelSelected: string, newSelectionState: boolean) => unknown;
+}
+
+export const MultiSelectBar: React.FC<MultiSelectBarProps> = ({ items, onSelectionChanged, id }) => {
+    const changeHandler: React.ChangeEventHandler<HTMLInputElement> = React.useCallback(e => {
+        onSelectionChanged(e.target.id, e.target.checked);
+    }, [onSelectionChanged]);
+
+    return (
+        <div className='multi-select-bar' id={id}>
+            {items.map(({ label, id: itemId, defaultChecked }) => (<LabeledCheckbox
+                label={label}
+                onChange={changeHandler}
+                defaultChecked={!!defaultChecked}
+                id={itemId}
+                key={`${label}-${id}-checkbox`}
+            />))}
+        </div>
+    );
+};
+
+interface LabeledCheckboxProps {
+    label: string;
+    id: string;
+    onChange: React.ChangeEventHandler;
+    defaultChecked: boolean;
+}
+
+const LabeledCheckbox: React.FC<LabeledCheckboxProps> = ({ defaultChecked, label, onChange, id }) => (
+    <div className='multi-select-checkbox-wrapper'>
+        <input
+            tabIndex={0}
+            type='checkbox'
+            id={id}
+            className='multi-select-checkbox'
+            defaultChecked={defaultChecked}
+            onChange={onChange}
+        />
+        <MWLabel id={id} label={label} classNames={['multi-select-label']} />
+    </div>
+);
+
+export const MWMultiSelect: React.FC<MWLabelProps & MultiSelectBarProps> = ({ id, label, disabled, items, onSelectionChanged }) => (
+    <>
+        <MWLabel id={id} label={label} disabled={disabled} />
+        <MultiSelectBar id={id} items={items} onSelectionChanged={onSelectionChanged} />
+    </>
+);