@theia/preferences 1.34.2 → 1.34.3

package/src/browser/views/components/preference-number-input.ts

@@ -1,147 +1,147 @@
-// *****************************************************************************
-// 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 { nls } from '@theia/core';
-import { injectable, interfaces } from '@theia/core/shared/inversify';
-import { Preference } from '../../util/preference-types';
-import { PreferenceLeafNodeRenderer, PreferenceNodeRenderer } from './preference-node-renderer';
-import { PreferenceLeafNodeRendererContribution } from './preference-node-renderer-creator';
-
-interface PreferenceNumberInputValidation {
-    /**
-     * the numeric value of the input. `NaN` if there is an error.
-     */
-    value: number;
-    /**
-     * the error message to display.
-     */
-    message: string;
-}
-
-@injectable()
-export class PreferenceNumberInputRenderer extends PreferenceLeafNodeRenderer<number, HTMLInputElement> {
-
-    protected _errorMessage: HTMLElement | undefined;
-    protected interactableWrapper: HTMLElement;
-
-    get errorMessage(): HTMLElement {
-        if (!this._errorMessage) {
-            const errorMessage = document.createElement('div');
-            errorMessage.classList.add('pref-error-notification');
-            this._errorMessage = errorMessage;
-        }
-        return this._errorMessage;
-    }
-
-    protected createInteractable(parent: HTMLElement): void {
-        const interactableWrapper = document.createElement('div');
-        this.interactableWrapper = interactableWrapper;
-        interactableWrapper.classList.add('pref-input-container');
-        const interactable = document.createElement('input');
-        this.interactable = interactable;
-        interactable.type = 'number';
-        interactable.step = this.preferenceNode.preference.data.type === 'integer' ? '1' : 'any';
-        interactable.classList.add('theia-input');
-        interactable.defaultValue = this.getValue()?.toString() ?? '';
-        interactable.oninput = this.handleUserInteraction.bind(this);
-        interactable.onblur = this.handleBlur.bind(this);
-        interactableWrapper.appendChild(interactable);
-        parent.appendChild(interactableWrapper);
-    }
-
-    protected getFallbackValue(): number {
-        return 0;
-    }
-
-    protected handleUserInteraction(): void {
-        const { value, message } = this.getInputValidation(this.interactable.value);
-        if (isNaN(value)) {
-            this.showErrorMessage(message);
-        } else {
-            this.hideErrorMessage();
-            this.setPreferenceWithDebounce(value);
-        }
-    }
-
-    protected async handleBlur(): Promise<void> {
-        this.hideErrorMessage();
-        await this.setPreferenceWithDebounce.flush();
-        this.handleValueChange();
-    }
-
-    protected doHandleValueChange(): void {
-        const { value } = this.interactable;
-        const currentValue = value.length ? Number(value) : NaN;
-        this.updateInspection();
-        const newValue = this.getValue() ?? '';
-        this.updateModificationStatus(newValue);
-        if (newValue !== currentValue) {
-            if (document.activeElement !== this.interactable) {
-                this.interactable.value = newValue.toString();
-            } else {
-                this.handleUserInteraction(); // give priority to the value of the input if it is focused.
-            }
-        }
-    }
-
-    protected getInputValidation(input: string): PreferenceNumberInputValidation {
-        const { preference: { data } } = this.preferenceNode;
-        const inputValue = Number(input);
-        const errorMessages: string[] = [];
-
-        if (input === '' || isNaN(inputValue)) {
-            return { value: NaN, message: nls.localizeByDefault('Value must be a number.') };
-        }
-        if (data.minimum && inputValue < data.minimum) {
-            errorMessages.push(nls.localizeByDefault('Value must be greater than or equal to {0}.', data.minimum));
-        };
-        if (data.maximum && inputValue > data.maximum) {
-            errorMessages.push(nls.localizeByDefault('Value must be less than or equal to {0}.', data.maximum));
-        };
-        if (data.type === 'integer' && !Number.isInteger(inputValue)) {
-            errorMessages.push(nls.localizeByDefault('Value must be an integer.'));
-        }
-
-        return {
-            value: errorMessages.length ? NaN : inputValue,
-            message: errorMessages.join(' ')
-        };
-    }
-
-    protected showErrorMessage(message: string): void {
-        this.errorMessage.textContent = message;
-        this.interactableWrapper.appendChild(this.errorMessage);
-    }
-
-    protected hideErrorMessage(): void {
-        this.errorMessage.remove();
-    }
-}
-
-@injectable()
-export class PreferenceNumberInputRendererContribution extends PreferenceLeafNodeRendererContribution {
-    static ID = 'preference-number-input-renderer';
-    id = PreferenceNumberInputRendererContribution.ID;
-
-    canHandleLeafNode(node: Preference.LeafNode): number {
-        const type = Preference.LeafNode.getType(node);
-        return type === 'integer' || type === 'number' ? 2 : 0;
-    }
-
-    createLeafNodeRenderer(container: interfaces.Container): PreferenceNodeRenderer {
-        return container.get(PreferenceNumberInputRenderer);
-    }
-}
+// *****************************************************************************
+// 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 { nls } from '@theia/core';
+import { injectable, interfaces } from '@theia/core/shared/inversify';
+import { Preference } from '../../util/preference-types';
+import { PreferenceLeafNodeRenderer, PreferenceNodeRenderer } from './preference-node-renderer';
+import { PreferenceLeafNodeRendererContribution } from './preference-node-renderer-creator';
+
+interface PreferenceNumberInputValidation {
+    /**
+     * the numeric value of the input. `NaN` if there is an error.
+     */
+    value: number;
+    /**
+     * the error message to display.
+     */
+    message: string;
+}
+
+@injectable()
+export class PreferenceNumberInputRenderer extends PreferenceLeafNodeRenderer<number, HTMLInputElement> {
+
+    protected _errorMessage: HTMLElement | undefined;
+    protected interactableWrapper: HTMLElement;
+
+    get errorMessage(): HTMLElement {
+        if (!this._errorMessage) {
+            const errorMessage = document.createElement('div');
+            errorMessage.classList.add('pref-error-notification');
+            this._errorMessage = errorMessage;
+        }
+        return this._errorMessage;
+    }
+
+    protected createInteractable(parent: HTMLElement): void {
+        const interactableWrapper = document.createElement('div');
+        this.interactableWrapper = interactableWrapper;
+        interactableWrapper.classList.add('pref-input-container');
+        const interactable = document.createElement('input');
+        this.interactable = interactable;
+        interactable.type = 'number';
+        interactable.step = this.preferenceNode.preference.data.type === 'integer' ? '1' : 'any';
+        interactable.classList.add('theia-input');
+        interactable.defaultValue = this.getValue()?.toString() ?? '';
+        interactable.oninput = this.handleUserInteraction.bind(this);
+        interactable.onblur = this.handleBlur.bind(this);
+        interactableWrapper.appendChild(interactable);
+        parent.appendChild(interactableWrapper);
+    }
+
+    protected getFallbackValue(): number {
+        return 0;
+    }
+
+    protected handleUserInteraction(): void {
+        const { value, message } = this.getInputValidation(this.interactable.value);
+        if (isNaN(value)) {
+            this.showErrorMessage(message);
+        } else {
+            this.hideErrorMessage();
+            this.setPreferenceWithDebounce(value);
+        }
+    }
+
+    protected async handleBlur(): Promise<void> {
+        this.hideErrorMessage();
+        await this.setPreferenceWithDebounce.flush();
+        this.handleValueChange();
+    }
+
+    protected doHandleValueChange(): void {
+        const { value } = this.interactable;
+        const currentValue = value.length ? Number(value) : NaN;
+        this.updateInspection();
+        const newValue = this.getValue() ?? '';
+        this.updateModificationStatus(newValue);
+        if (newValue !== currentValue) {
+            if (document.activeElement !== this.interactable) {
+                this.interactable.value = newValue.toString();
+            } else {
+                this.handleUserInteraction(); // give priority to the value of the input if it is focused.
+            }
+        }
+    }
+
+    protected getInputValidation(input: string): PreferenceNumberInputValidation {
+        const { preference: { data } } = this.preferenceNode;
+        const inputValue = Number(input);
+        const errorMessages: string[] = [];
+
+        if (input === '' || isNaN(inputValue)) {
+            return { value: NaN, message: nls.localizeByDefault('Value must be a number.') };
+        }
+        if (data.minimum && inputValue < data.minimum) {
+            errorMessages.push(nls.localizeByDefault('Value must be greater than or equal to {0}.', data.minimum));
+        };
+        if (data.maximum && inputValue > data.maximum) {
+            errorMessages.push(nls.localizeByDefault('Value must be less than or equal to {0}.', data.maximum));
+        };
+        if (data.type === 'integer' && !Number.isInteger(inputValue)) {
+            errorMessages.push(nls.localizeByDefault('Value must be an integer.'));
+        }
+
+        return {
+            value: errorMessages.length ? NaN : inputValue,
+            message: errorMessages.join(' ')
+        };
+    }
+
+    protected showErrorMessage(message: string): void {
+        this.errorMessage.textContent = message;
+        this.interactableWrapper.appendChild(this.errorMessage);
+    }
+
+    protected hideErrorMessage(): void {
+        this.errorMessage.remove();
+    }
+}
+
+@injectable()
+export class PreferenceNumberInputRendererContribution extends PreferenceLeafNodeRendererContribution {
+    static ID = 'preference-number-input-renderer';
+    id = PreferenceNumberInputRendererContribution.ID;
+
+    canHandleLeafNode(node: Preference.LeafNode): number {
+        const type = Preference.LeafNode.getType(node);
+        return type === 'integer' || type === 'number' ? 2 : 0;
+    }
+
+    createLeafNodeRenderer(container: interfaces.Container): PreferenceNodeRenderer {
+        return container.get(PreferenceNumberInputRenderer);
+    }
+}

package/src/browser/views/components/preference-select-input.ts

@@ -1,127 +1,127 @@
-// *****************************************************************************
-// 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 { PreferenceLeafNodeRenderer, PreferenceNodeRenderer } from './preference-node-renderer';
-import { injectable, interfaces } from '@theia/core/shared/inversify';
-import { JSONValue } from '@theia/core/shared/@phosphor/coreutils';
-import { PreferenceProvider } from '@theia/core/lib/browser/preferences/preference-provider';
-import { SelectComponent, SelectOption } from '@theia/core/lib/browser/widgets/select-component';
-import { Preference } from '../../util/preference-types';
-import { PreferenceLeafNodeRendererContribution } from './preference-node-renderer-creator';
-import * as React from '@theia/core/shared/react';
-import { createRoot } from '@theia/core/shared/react-dom/client';
-import { escapeInvisibleChars } from '@theia/core/lib/common/strings';
-
-@injectable()
-export class PreferenceSelectInputRenderer extends PreferenceLeafNodeRenderer<JSONValue, HTMLDivElement> {
-
-    protected readonly selectComponent = React.createRef<SelectComponent>();
-
-    protected get enumValues(): JSONValue[] {
-        return this.preferenceNode.preference.data.enum!;
-    }
-
-    protected get selectOptions(): SelectOption[] {
-        const items: SelectOption[] = [];
-        const values = this.enumValues;
-        const preferenceData = this.preferenceNode.preference.data;
-        const defaultValue = preferenceData.default;
-        for (let i = 0; i < values.length; i++) {
-            const value = values[i];
-            const stringValue = `${value}`;
-            const label = escapeInvisibleChars(preferenceData.enumItemLabels?.[i] ?? stringValue);
-            const detail = PreferenceProvider.deepEqual(defaultValue, value) ? 'default' : undefined;
-            let enumDescription = preferenceData.enumDescriptions?.[i];
-            let markdown = false;
-            const markdownEnumDescription = preferenceData.markdownEnumDescriptions?.[i];
-            if (markdownEnumDescription) {
-                enumDescription = this.markdownRenderer.renderInline(markdownEnumDescription);
-                markdown = true;
-            }
-            items.push({
-                label,
-                value: stringValue,
-                detail,
-                description: enumDescription,
-                markdown
-            });
-        }
-        return items;
-    }
-
-    protected createInteractable(parent: HTMLElement): void {
-        const interactable = document.createElement('div');
-        const selectComponent = React.createElement(SelectComponent, {
-            options: this.selectOptions,
-            defaultValue: this.getDataValue(),
-            onChange: (_, index) => this.handleUserInteraction(index),
-            ref: this.selectComponent
-        });
-        this.interactable = interactable;
-        const root = createRoot(interactable);
-        root.render(selectComponent);
-        parent.appendChild(interactable);
-    }
-
-    protected getFallbackValue(): JSONValue {
-        const { default: schemaDefault, defaultValue, enum: enumValues } = this.preferenceNode.preference.data;
-        return schemaDefault !== undefined
-            ? schemaDefault : defaultValue !== undefined
-                ? defaultValue
-                : enumValues![0];
-    }
-
-    protected doHandleValueChange(): void {
-        this.updateInspection();
-        const newValue = this.getDataValue();
-        this.updateModificationStatus(this.getValue());
-        if (document.activeElement !== this.interactable && this.selectComponent.current) {
-            this.selectComponent.current.value = newValue;
-        }
-    }
-
-    /**
-     * Returns the stringified index corresponding to the currently selected value.
-     */
-    protected getDataValue(): number {
-        const currentValue = this.getValue();
-        let selected = this.enumValues.findIndex(value => PreferenceProvider.deepEqual(value, currentValue));
-        if (selected === -1) {
-            const fallback = this.getFallbackValue();
-            selected = this.enumValues.findIndex(value => PreferenceProvider.deepEqual(value, fallback));
-        }
-        return Math.max(selected, 0);
-    }
-
-    protected handleUserInteraction(selected: number): void {
-        const value = this.enumValues[selected];
-        this.setPreferenceImmediately(value);
-    }
-}
-
-@injectable()
-export class PreferenceSelectInputRendererContribution extends PreferenceLeafNodeRendererContribution {
-    static ID = 'preference-select-input-renderer';
-    id = PreferenceSelectInputRendererContribution.ID;
-
-    canHandleLeafNode(node: Preference.LeafNode): number {
-        return node.preference.data.enum ? 3 : 0;
-    }
-
-    createLeafNodeRenderer(container: interfaces.Container): PreferenceNodeRenderer {
-        return container.get(PreferenceSelectInputRenderer);
-    }
-}
+// *****************************************************************************
+// 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 { PreferenceLeafNodeRenderer, PreferenceNodeRenderer } from './preference-node-renderer';
+import { injectable, interfaces } from '@theia/core/shared/inversify';
+import { JSONValue } from '@theia/core/shared/@phosphor/coreutils';
+import { PreferenceProvider } from '@theia/core/lib/browser/preferences/preference-provider';
+import { SelectComponent, SelectOption } from '@theia/core/lib/browser/widgets/select-component';
+import { Preference } from '../../util/preference-types';
+import { PreferenceLeafNodeRendererContribution } from './preference-node-renderer-creator';
+import * as React from '@theia/core/shared/react';
+import { createRoot } from '@theia/core/shared/react-dom/client';
+import { escapeInvisibleChars } from '@theia/core/lib/common/strings';
+
+@injectable()
+export class PreferenceSelectInputRenderer extends PreferenceLeafNodeRenderer<JSONValue, HTMLDivElement> {
+
+    protected readonly selectComponent = React.createRef<SelectComponent>();
+
+    protected get enumValues(): JSONValue[] {
+        return this.preferenceNode.preference.data.enum!;
+    }
+
+    protected get selectOptions(): SelectOption[] {
+        const items: SelectOption[] = [];
+        const values = this.enumValues;
+        const preferenceData = this.preferenceNode.preference.data;
+        const defaultValue = preferenceData.default;
+        for (let i = 0; i < values.length; i++) {
+            const value = values[i];
+            const stringValue = `${value}`;
+            const label = escapeInvisibleChars(preferenceData.enumItemLabels?.[i] ?? stringValue);
+            const detail = PreferenceProvider.deepEqual(defaultValue, value) ? 'default' : undefined;
+            let enumDescription = preferenceData.enumDescriptions?.[i];
+            let markdown = false;
+            const markdownEnumDescription = preferenceData.markdownEnumDescriptions?.[i];
+            if (markdownEnumDescription) {
+                enumDescription = this.markdownRenderer.renderInline(markdownEnumDescription);
+                markdown = true;
+            }
+            items.push({
+                label,
+                value: stringValue,
+                detail,
+                description: enumDescription,
+                markdown
+            });
+        }
+        return items;
+    }
+
+    protected createInteractable(parent: HTMLElement): void {
+        const interactable = document.createElement('div');
+        const selectComponent = React.createElement(SelectComponent, {
+            options: this.selectOptions,
+            defaultValue: this.getDataValue(),
+            onChange: (_, index) => this.handleUserInteraction(index),
+            ref: this.selectComponent
+        });
+        this.interactable = interactable;
+        const root = createRoot(interactable);
+        root.render(selectComponent);
+        parent.appendChild(interactable);
+    }
+
+    protected getFallbackValue(): JSONValue {
+        const { default: schemaDefault, defaultValue, enum: enumValues } = this.preferenceNode.preference.data;
+        return schemaDefault !== undefined
+            ? schemaDefault : defaultValue !== undefined
+                ? defaultValue
+                : enumValues![0];
+    }
+
+    protected doHandleValueChange(): void {
+        this.updateInspection();
+        const newValue = this.getDataValue();
+        this.updateModificationStatus(this.getValue());
+        if (document.activeElement !== this.interactable && this.selectComponent.current) {
+            this.selectComponent.current.value = newValue;
+        }
+    }
+
+    /**
+     * Returns the stringified index corresponding to the currently selected value.
+     */
+    protected getDataValue(): number {
+        const currentValue = this.getValue();
+        let selected = this.enumValues.findIndex(value => PreferenceProvider.deepEqual(value, currentValue));
+        if (selected === -1) {
+            const fallback = this.getFallbackValue();
+            selected = this.enumValues.findIndex(value => PreferenceProvider.deepEqual(value, fallback));
+        }
+        return Math.max(selected, 0);
+    }
+
+    protected handleUserInteraction(selected: number): void {
+        const value = this.enumValues[selected];
+        this.setPreferenceImmediately(value);
+    }
+}
+
+@injectable()
+export class PreferenceSelectInputRendererContribution extends PreferenceLeafNodeRendererContribution {
+    static ID = 'preference-select-input-renderer';
+    id = PreferenceSelectInputRendererContribution.ID;
+
+    canHandleLeafNode(node: Preference.LeafNode): number {
+        return node.preference.data.enum ? 3 : 0;
+    }
+
+    createLeafNodeRenderer(container: interfaces.Container): PreferenceNodeRenderer {
+        return container.get(PreferenceSelectInputRenderer);
+    }
+}