Improve editor preference dendrification (#11711)

eclipse-theia · Sep 30, 2022 · d3f6359 · d3f6359
1 parent fd845f6
commit d3f6359
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/packages/monaco/src/browser/monaco-editor-provider.ts b/packages/monaco/src/browser/monaco-editor-provider.ts
@@ -351,17 +351,17 @@ export class MonacoEditorProvider {
     }
 
     /** @deprecated always pass a language as an overrideIdentifier */
-    protected createOptions(prefixes: string[], uri: string): { [name: string]: any };
-    protected createOptions(prefixes: string[], uri: string, overrideIdentifier: string): { [name: string]: any };
-    protected createOptions(prefixes: string[], uri: string, overrideIdentifier?: string): { [name: string]: any } {
+    protected createOptions(prefixes: string[], uri: string): Record<string, any>;
+    protected createOptions(prefixes: string[], uri: string, overrideIdentifier: string): Record<string, any>;
+    protected createOptions(prefixes: string[], uri: string, overrideIdentifier?: string): Record<string, any> {
         const flat: Record<string, any> = {};
         for (const preferenceName of Object.keys(this.editorPreferences)) {
             flat[preferenceName] = (<any>this.editorPreferences).get({ preferenceName, overrideIdentifier }, undefined, uri);
         }
         return Object.entries(flat).reduce((tree, [preferenceName, value]) => this.setOption(preferenceName, deepClone(value), prefixes, tree), {});
     }
 
-    protected setOption(preferenceName: string, value: any, prefixes: string[], options: { [name: string]: any } = {}): {
+    protected setOption(preferenceName: string, value: any, prefixes: string[], options: Record<string, any> = {}): {
         [name: string]: any;
     } {
         const optionName = this.toOptionName(preferenceName, prefixes);
@@ -376,16 +376,19 @@ export class MonacoEditorProvider {
         }
         return preferenceName;
     }
-    protected doSetOption(obj: { [name: string]: any }, value: any, names: string[], idx: number = 0): void {
-        const name = names[idx];
-        if (!obj[name]) {
-            if (names.length > (idx + 1)) {
-                obj[name] = {};
-                this.doSetOption(obj[name], value, names, (idx + 1));
+    protected doSetOption(obj: Record<string, any>, value: any, names: string[]): void {
+        for (let i = 0; i < names.length - 1; i++) {
+            const name = names[i];
+            if (obj[name] === undefined) {
+                obj = obj[name] = {};
+            } else if (typeof obj[name] !== 'object' || obj[name] === null) { // eslint-disable-line no-null/no-null
+                console.warn(`Preference (diff)editor.${names.join('.')} conflicts with another preference name.`);
+                obj = obj[name] = {};
             } else {
-                obj[name] = value;
+                obj = obj[name];
             }
         }
+        obj[names[names.length - 1]] = value;
     }
 
     getDiffNavigator(editor: TextEditor): DiffNavigator {

diff --git a/packages/monaco/src/browser/monaco-editor.ts b/packages/monaco/src/browser/monaco-editor.ts
@@ -134,6 +134,7 @@ export class MonacoEditor extends MonacoEditorServices implements TextEditor {
             lightbulb: { enabled: true },
             fixedOverflowWidgets: true,
             scrollbar: {
+                ...options?.scrollbar,
                 useShadows: false,
                 verticalHasArrows: false,
                 horizontalHasArrows: false,