@theia/preferences 1.68.0-next.9 → 1.69.0-next.0

package/src/browser/views/components/preference-node-renderer.ts

@@ -21,7 +21,7 @@ import {
 import { Preference, PreferenceMenus } from '../../util/preference-types';
 import { PreferenceTreeLabelProvider } from '../../util/preference-tree-label-provider';
 import { PreferencesScopeTabBar } from '../preference-scope-tabbar-widget';
-import { Disposable, nls, PreferenceDataProperty, PreferenceInspection, PreferenceScope, PreferenceService, PreferenceUtils } from '@theia/core/lib/common';
+import { Disposable, nls, PreferenceDataProperty, PreferenceInspection, PreferenceScope, PreferenceService } from '@theia/core/lib/common';
 import { JSONValue } from '@theia/core/shared/@lumino/coreutils';
 import debounce = require('@theia/core/shared/lodash.debounce');
 import { PreferenceTreeModel } from '../../preference-tree-model';
@@ -168,7 +168,7 @@ export abstract class PreferenceLeafNodeRenderer<ValueType extends JSONValue, In
     protected gutter: HTMLDivElement;
     protected interactable: InteractableType;
     protected inspection: PreferenceInspection<ValueType> | undefined;
-    protected isModifiedFromDefault = false;
+    protected isSet = false;
 
     get schema(): PreferenceDataProperty {
         return this.preferenceNode.preference.data;
@@ -290,13 +290,13 @@ export abstract class PreferenceLeafNodeRenderer<ValueType extends JSONValue, In
         this.gutter.classList.remove('show-cog');
     }
 
-    protected updateModificationStatus(knownCurrentValue?: JSONValue): void {
-        const wasModified = this.isModifiedFromDefault;
+    protected updateModificationStatus(): void {
+        const wasSet = this.isSet;
         const { inspection } = this;
-        const valueInCurrentScope = knownCurrentValue ?? Preference.getValueInScope(inspection, this.scopeTracker.currentScope.scope);
-        this.isModifiedFromDefault = valueInCurrentScope !== undefined && !PreferenceUtils.deepEqual(valueInCurrentScope, this.getDefaultValue());
-        if (wasModified !== this.isModifiedFromDefault) {
-            this.gutter.classList.toggle('theia-mod-item-modified', this.isModifiedFromDefault);
+        const valueInCurrentScope = Preference.getValueInScope(inspection, this.scopeTracker.currentScope.scope);
+        this.isSet = valueInCurrentScope !== undefined;
+        if (wasSet !== this.isSet) {
+            this.gutter.classList.toggle('theia-mod-item-modified', this.isSet);
         }
     }
 
@@ -308,6 +308,29 @@ export abstract class PreferenceLeafNodeRenderer<ValueType extends JSONValue, In
             nameWrapper.classList.add('preference-leaf-headline-name');
             nameWrapper.textContent = name;
             headlineWrapper.appendChild(nameWrapper);
+
+            const tags = this.schema.tags;
+            if (tags && tags.length > 0) {
+                const tagsWrapper = document.createElement('span');
+                tagsWrapper.classList.add('preference-leaf-headline-tags');
+                const PREVIEW_INDICATOR_DESCRIPTION = nls.localizeByDefault(
+                    'Preview setting: this setting controls a new feature that is still under refinement yet ready to use. Feedback is welcome.');
+                const EXPERIMENTAL_INDICATOR_DESCRIPTION = nls.localizeByDefault(
+                    'Experimental setting: this setting controls a new feature that is actively being developed and may be unstable. It is subject to change or removal.');
+
+                tags.forEach(tag => {
+                    const tagElement = document.createElement('span');
+                    const isExperimentalSetting = tag === 'experimental';
+                    const isPreviewSetting = tag === 'preview';
+                    tagElement.classList.add('preference-tag');
+                    tagElement.textContent = isExperimentalSetting ? nls.localizeByDefault('Experimental') :
+                        isPreviewSetting ? nls.localizeByDefault('Preview') : tag;
+                    tagElement.title = isExperimentalSetting ? EXPERIMENTAL_INDICATOR_DESCRIPTION :
+                        isPreviewSetting ? PREVIEW_INDICATOR_DESCRIPTION : tag;
+                    tagsWrapper.appendChild(tagElement);
+                });
+                headlineWrapper.appendChild(tagsWrapper);
+            }
         }
         const prefix = this.labelProvider.getPrefix(this.preferenceNode, filtered);
         const currentFirstChild = headlineWrapper.children[0];
@@ -394,7 +417,7 @@ export abstract class PreferenceLeafNodeRenderer<ValueType extends JSONValue, In
     }
 
     protected getModifiedMessagePrefix(): string {
-        return (this.isModifiedFromDefault ? nls.localizeByDefault('Also modified in') : nls.localizeByDefault('Modified in')) + ': ';
+        return (this.isSet ? nls.localizeByDefault('Also modified in') : nls.localizeByDefault('Modified in')) + ': ';
     }
 
     protected addEventHandlerToModifiedScope(scope: PreferenceScope, scopeWrapper: HTMLElement): void {
@@ -421,7 +444,7 @@ export abstract class PreferenceLeafNodeRenderer<ValueType extends JSONValue, In
             for (const otherScope of [PreferenceScope.User, PreferenceScope.Workspace]) {
                 if (otherScope !== currentScopeInView) {
                     const valueInOtherScope = Preference.getValueInScope(inspection, otherScope);
-                    if (valueInOtherScope !== undefined && !PreferenceUtils.deepEqual(valueInOtherScope, this.getDefaultValue())) {
+                    if (valueInOtherScope !== undefined) {
                         modifiedScopes.push(otherScope);
                     }
                 }

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

@@ -86,11 +86,11 @@ export class PreferenceNumberInputRenderer extends PreferenceLeafNodeRenderer<nu
         const { value } = this.interactable;
         const currentValue = value.length ? Number(value) : NaN;
         this.updateInspection();
-        const newValue = this.getValue() ?? '';
-        this.updateModificationStatus(newValue);
+        const newValue = this.getValue();
+        this.updateModificationStatus();
         if (newValue !== currentValue) {
             if (document.activeElement !== this.interactable) {
-                this.interactable.value = newValue.toString();
+                this.interactable.value = (newValue ?? this.getDefaultValue()).toString();
             } else {
                 this.handleUserInteraction(); // give priority to the value of the input if it is focused.
             }

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

@@ -88,7 +88,7 @@ export class PreferenceSelectInputRenderer extends PreferenceLeafNodeRenderer<JS
         this.updateInspection();
         this.updateSelectOptions();
         const newValue = this.getDataValue();
-        this.updateModificationStatus(this.getValue());
+        this.updateModificationStatus();
         if (document.activeElement !== this.interactable && this.selectComponent.current) {
             this.selectComponent.current.value = newValue;
         }

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

@@ -40,11 +40,11 @@ export class PreferenceStringInputRenderer extends PreferenceLeafNodeRenderer<st
     protected doHandleValueChange(): void {
         const currentValue = this.interactable.value;
         this.updateInspection();
-        const newValue = this.getValue() ?? '';
-        this.updateModificationStatus(newValue);
+        const newValue = this.getValue();
+        this.updateModificationStatus();
         if (newValue !== currentValue) {
             if (document.activeElement !== this.interactable) {
-                this.interactable.value = newValue;
+                this.interactable.value = newValue ?? this.getDefaultValue();
             } else {
                 this.handleUserInteraction(); // give priority to the value of the input if it is focused.
             }