@opensumi/ide-preferences 2.20.3 → 2.20.4

package/lib/browser/index.less

@@ -0,0 +1,36 @@
+.preference-view {
+  margin: 40;
+  height: 100%;
+  color: #ccc;
+  .scope-select {
+    position: fixed;
+    right: 100px;
+  }
+  .preference-line {
+    margin: 40px;
+  }
+  .key {
+    font-weight: bold;
+  }
+  .control-wrap {
+    color: #fff;
+    select,
+    input {
+      border: none;
+      background: #333;
+      padding: 3px 5px;
+    }
+  }
+  .desc {
+  }
+  .text-control {
+    max-width: 500px;
+    width: 100%;
+  }
+  .select-control {
+    width: 300px;
+  }
+  .number-control {
+    width: 300px;
+  }
+}

package/lib/browser/preference-settings.service.d.ts

@@ -1,6 +1,5 @@
-import { IBasicRecycleTreeHandle, IRecycleTreeHandle } from '@opensumi/ide-components';
-import { IVirtualListHandle } from '@opensumi/ide-components/lib/virtual-list/types';
-import { IPreferenceViewDesc, IPreferenceSettingsService, ISettingGroup, ISettingSection, PreferenceProviderProvider, Event, CommandService, PreferenceScope, PreferenceSchemaProvider, IDisposable, PreferenceService, IResolvedSettingSection } from '@opensumi/ide-core-browser';
+import { IRecycleListHandler } from '@opensumi/ide-components';
+import { IPreferenceViewDesc, IPreferenceSettingsService, ISettingGroup, ISettingSection, PreferenceProviderProvider, Event, CommandService, PreferenceScope, PreferenceSchemaProvider, IDisposable, PreferenceService } from '@opensumi/ide-core-browser';
 import { IFileServiceClient } from '@opensumi/ide-file-service';
 export declare class PreferenceSettingsService implements IPreferenceSettingsService {
     private static DEFAULT_CHANGE_DELAY;
@@ -18,8 +17,6 @@ export declare class PreferenceSettingsService implements IPreferenceSettingsSer
     private enumLabels;
     private cachedGroupSection;
     private _listHandler;
-    private _treeHandler;
-    private _basicTreeHandler;
     private onDidEnumLabelsChangeEmitter;
     private enumLabelsChangeDelayer;
     private onDidSettingsChangeEmitter;
@@ -38,12 +35,8 @@ export declare class PreferenceSettingsService implements IPreferenceSettingsSer
      * @param scope 作用域
      */
     setPreference(key: string, value: any, scope: PreferenceScope): Promise<void>;
-    get listHandler(): import("react-virtuoso").VirtuosoHandle;
-    handleListHandler: (handler: IVirtualListHandle) => void;
-    get treeHandler(): IRecycleTreeHandle;
-    handleTreeHandler: (handler: any) => void;
-    get basicTreeHandler(): IBasicRecycleTreeHandle;
-    handleBasicTreeHandler: (handler: any) => void;
+    get listHandler(): IRecycleListHandler;
+    handleListHandler: (handler: any) => void;
     /**
      * 获取搜索条件下展示的设置面板配置组
      * @param scope 作用域
@@ -62,7 +55,6 @@ export declare class PreferenceSettingsService implements IPreferenceSettingsSer
      * @param section 配置项内容
      */
     registerSettingSection(groupId: string, section: ISettingSection): IDisposable;
-    visitSection(section: ISettingSection, cb: (v: IPreferenceViewDesc) => boolean | undefined): IPreferenceViewDesc | undefined;
     /**
      * 通过配置项ID获取配置项展示信息
      * @param preferenceId 配置项ID
@@ -74,7 +66,7 @@ export declare class PreferenceSettingsService implements IPreferenceSettingsSer
      * @param scope 作用域
      * @param search 搜索条件
      */
-    getResolvedSections(groupId: string, scope: PreferenceScope, search?: string): IResolvedSettingSection[];
+    getSections(groupId: string, scope: PreferenceScope, search?: string): ISettingSection[];
     /**
      * 获取某个配置名在特定作用域下的值
      * @param preferenceName 配置名

package/lib/browser/preference-settings.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preference-settings.service.d.ts","sourceRoot":"","sources":["../../src/browser/preference-settings.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"preference-settings.service.d.ts","sourceRoot":"","sources":["../../src/browser/preference-settings.service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EACL,mBAAmB,EACnB,0BAA0B,EAC1B,aAAa,EACb,eAAe,EACf,0BAA0B,EAE1B,KAAK,EACL,cAAc,EAId,eAAe,EAEf,wBAAwB,EACxB,WAAW,EAGX,iBAAiB,EAIlB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAOhE,qBACa,yBAA0B,YAAW,0BAA0B;IAC1E,OAAO,CAAC,MAAM,CAAC,oBAAoB,CAAO;IAG1C,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,wBAAwB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,0BAA0B,CAAC;IAGhE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,kBAAkB,CAAC;IAGzD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAG3C,YAAY,SAAM;IAGlB,aAAa,SAAM;IAE1B,OAAO,CAAC,YAAY,CAAkB;IAE/B,eAAe,CAAC,OAAO,EAAE,MAAM;IAQtC,OAAO,CAAC,cAAc,CAAuB;IAE7C,OAAO,CAAC,gBAAgB,CAA6C;IAErE,OAAO,CAAC,UAAU,CAAqD;IAEvE,OAAO,CAAC,kBAAkB,CAA6C;IAEvE,OAAO,CAAC,YAAY,CAAsB;IAE1C,OAAO,CAAC,4BAA4B,CAAgC;IACpE,OAAO,CAAC,uBAAuB,CAA8E;IAE7G,OAAO,CAAC,0BAA0B,CAAgC;;IAmBlE,IAAI,qBAAqB,gBAExB;IAED,IAAI,mBAAmB,gBAEtB;IAED,qBAAqB;IAIrB,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,QAAQ;IAQhB,QAAQ,UAAW,eAAe,gBAAgB,MAAM,UAGtD;IAEF;;;;;OAKG;IACG,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,eAAe;IAInE,IAAI,WAAW,wBAEd;IAED,iBAAiB,YAAa,GAAG,UAE/B;IAEF;;;;OAIG;IACH,gBAAgB,CAAC,KAAK,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa,EAAE;IAMhF,mBAAmB,CAAC,KAAK,EAAE,eAAe;IAUhD;;;OAGG;IACH,oBAAoB,CAAC,KAAK,EAAE,aAAa,GAAG,WAAW;IAMvD;;;;OAIG;IACH,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,WAAW;IAU9E;;;OAGG;IACH,wBAAwB,CAAC,YAAY,EAAE,MAAM;IAe7C;;;;;OAKG;IACH,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,eAAe,EAAE;IA+CxF;;;;;OAKG;IACH,aAAa,CACX,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,eAAe,EACtB,SAAS,UAAQ,GAChB;QAAE,KAAK,EAAE,GAAG,CAAC;QAAC,cAAc,EAAE,eAAe,CAAA;KAAE;IAelD;;;OAGG;IACH,aAAa,CAAC,cAAc,EAAE,MAAM,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;IAIhE;;;;OAIG;IACH,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;IAUvE;;;;OAIG;IACG,KAAK,CAAC,cAAc,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe;IAI1D;;;OAGG;IACG,gBAAgB,CAAC,KAAK,EAAE,eAAe;IAW7C;;;OAGG;IACG,uBAAuB,CAAC,KAAK,CAAC,EAAE,eAAe;IAgBrD;;;OAGG;IACH,MAAM,UAAW,MAAM,UAErB;IAEF,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsC;IAE/D,IAAI,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,CAEzB;IAED,UAAU;CAGX;AAED,eAAO,MAAM,mBAAmB,EAAE,aAAa,EA0B9C,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE;IACnC,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,EAAE,CAAC;CA8NlC,CAAC"}

package/lib/browser/preference-settings.service.js

@@ -28,12 +28,6 @@ let PreferenceSettingsService = PreferenceSettingsService_1 = class PreferenceSe
         this.handleListHandler = (handler) => {
             this._listHandler = handler;
         };
-        this.handleTreeHandler = (handler) => {
-            this._treeHandler = handler;
-        };
-        this.handleBasicTreeHandler = (handler) => {
-            this._basicTreeHandler = handler;
-        };
         /**
          * 在设置面板下搜索配置
          * @param value 搜索值
@@ -43,7 +37,7 @@ let PreferenceSettingsService = PreferenceSettingsService_1 = class PreferenceSe
         };
         this._onFocus = new ide_core_browser_1.Emitter();
         this.setEnumLabels('general.language', new Proxy({}, {
-            get: (target, key) => { var _a; return (_a = (0, ide_core_browser_1.getAvailableLanguages)().find((l) => l.languageId === key)) === null || _a === void 0 ? void 0 : _a.localizedLanguageName; },
+            get: (target, key) => (0, ide_core_browser_1.getAvailableLanguages)().find((l) => l.languageId === key).localizedLanguageName,
         }));
         this.setEnumLabels('files.eol', {
             '\n': 'LF',
@@ -71,7 +65,9 @@ let PreferenceSettingsService = PreferenceSettingsService_1 = class PreferenceSe
         return value.toLocaleLowerCase().indexOf(search.toLocaleLowerCase()) > -1;
     }
     filterPreferences(preference, scope) {
-        return Array.isArray(preference.hiddenInScope) && preference.hiddenInScope.includes(scope);
+        return (typeof preference !== 'string' &&
+            Array.isArray(preference.hiddenInScope) &&
+            preference.hiddenInScope.includes(scope));
     }
     doSearch(value) {
         if (value) {
@@ -93,12 +89,6 @@ let PreferenceSettingsService = PreferenceSettingsService_1 = class PreferenceSe
     get listHandler() {
         return this._listHandler;
     }
-    get treeHandler() {
-        return this._treeHandler;
-    }
-    get basicTreeHandler() {
-        return this._basicTreeHandler;
-    }
     /**
      * 获取搜索条件下展示的设置面板配置组
      * @param scope 作用域
@@ -107,7 +97,7 @@ let PreferenceSettingsService = PreferenceSettingsService_1 = class PreferenceSe
     getSettingGroups(scope, search) {
         this.currentScope = scope;
         const groups = this.settingsGroups.slice();
-        return groups.filter((g) => this.getResolvedSections(g.id, scope, search).length > 0);
+        return groups.filter((g) => this.getSections(g.id, scope, search).length > 0);
     }
     async hasThisScopeSetting(scope) {
         const url = await this.getPreferenceUrl(scope);
@@ -122,7 +112,7 @@ let PreferenceSettingsService = PreferenceSettingsService_1 = class PreferenceSe
      * @param group 配置组
      */
     registerSettingGroup(group) {
-        const disposable = addElement(this.settingsGroups, Object.assign(Object.assign({}, group), { title: (0, ide_core_browser_1.replaceLocalizePlaceholder)(group.title) || group.title }));
+        const disposable = addElement(this.settingsGroups, group);
         this.fireDidSettingsChange();
         return disposable;
     }
@@ -140,21 +130,6 @@ let PreferenceSettingsService = PreferenceSettingsService_1 = class PreferenceSe
         this.fireDidSettingsChange();
         return disposable;
     }
-    visitSection(section, cb) {
-        if (section.preferences) {
-            for (const preference of section.preferences) {
-                const result = cb(preference);
-                if (result) {
-                    return preference;
-                }
-            }
-        }
-        if (section.subSections && Array.isArray(section.subSections)) {
-            for (const subSec of section.subSections) {
-                return this.visitSection(subSec, cb);
-            }
-        }
-    }
     /**
      * 通过配置项ID获取配置项展示信息
      * @param preferenceId 配置项ID
@@ -163,13 +138,13 @@ let PreferenceSettingsService = PreferenceSettingsService_1 = class PreferenceSe
         const groups = this.settingsSections.values();
         for (const sections of groups) {
             for (const section of sections) {
-                return this.visitSection(section, (preference) => {
+                for (const preference of section.preferences) {
                     if (!(0, ide_core_browser_1.isString)(preference)) {
                         if (preference.id === preferenceId) {
-                            return true;
+                            return preference;
                         }
                     }
-                });
+                }
             }
         }
     }
@@ -179,7 +154,7 @@ let PreferenceSettingsService = PreferenceSettingsService_1 = class PreferenceSe
      * @param scope 作用域
      * @param search 搜索条件
      */
-    getResolvedSections(groupId, scope, search) {
+    getSections(groupId, scope, search) {
         const key = [groupId, scope, search || ''].join('-');
         if (this.cachedGroupSection.has(key)) {
             return this.cachedGroupSection.get(key);
@@ -193,60 +168,29 @@ let PreferenceSettingsService = PreferenceSettingsService_1 = class PreferenceSe
             }
         });
         const result = [];
-        const processSection = (section) => {
-            const preferences = section.preferences
-                .filter((pref) => {
-                if (this.filterPreferences(pref, scope)) {
-                    return false;
-                }
-                return true;
-            })
-                .map((pref) => {
-                const prefId = typeof pref === 'string' ? pref : pref.id;
-                const schema = this.schemaProvider.getPreferenceProperty(prefId);
-                const prefLabel = typeof pref === 'string' ? (0, common_1.toPreferenceReadableName)(pref) : (0, common_1.getPreferenceItemLabel)(pref);
-                const description = schema && (0, ide_core_browser_1.replaceLocalizePlaceholder)(schema.description);
-                const markdownDescription = schema && (0, ide_core_browser_1.replaceLocalizePlaceholder)(schema.markdownDescription);
-                return {
-                    id: prefId,
-                    label: prefLabel,
-                    _description: markdownDescription !== null && markdownDescription !== void 0 ? markdownDescription : description,
-                    markdownDescription,
-                    description,
-                };
-            })
-                .filter((pref) => {
-                if (!search) {
-                    return true;
-                }
-                return (this.isContainSearchValue(pref.id, search) ||
-                    this.isContainSearchValue(pref.label, search) ||
-                    (pref.description && this.isContainSearchValue(pref.description, search)) ||
-                    (pref.markdownDescription && this.isContainSearchValue(pref.markdownDescription, search)));
-            });
-            return {
-                preferences,
-            };
-        };
         res.forEach((section) => {
-            const sec = Object.assign({}, section);
             if (section.preferences) {
-                const { preferences } = processSection(section);
-                sec.preferences = preferences;
-            }
-            if (section.subSections) {
-                const subSections = section.subSections
-                    .map((v) => {
-                    const { preferences } = processSection(v);
-                    if (preferences.length > 0) {
-                        return Object.assign(Object.assign({}, v), { preferences });
+                const sec = Object.assign({}, section);
+                sec.preferences = section.preferences.filter((pref) => {
+                    if (this.filterPreferences(pref, scope)) {
+                        return false;
                     }
-                })
-                    .filter(Boolean);
-                sec.subSections = subSections;
-            }
-            if ((sec.preferences && sec.preferences.length > 0) || (sec.subSections && sec.subSections.length > 0)) {
-                result.push(sec);
+                    if (!search) {
+                        return true;
+                    }
+                    const prefId = typeof pref === 'string' ? pref : pref.id;
+                    const schema = this.schemaProvider.getPreferenceProperty(prefId);
+                    const prefLabel = typeof pref === 'string' ? (0, common_1.toPreferenceReadableName)(pref) : (0, common_1.getPreferenceItemLabel)(pref);
+                    const description = schema && (0, ide_core_browser_1.replaceLocalizePlaceholder)(schema.description);
+                    const markdownDescription = schema && (0, ide_core_browser_1.replaceLocalizePlaceholder)(schema.markdownDescription);
+                    return (this.isContainSearchValue(prefId, search) ||
+                        this.isContainSearchValue(prefLabel, search) ||
+                        (description && this.isContainSearchValue(description, search)) ||
+                        (markdownDescription && this.isContainSearchValue(markdownDescription, search)));
+                });
+                if (sec.preferences.length > 0) {
+                    result.push(sec);
+                }
             }
         });
         this.cachedGroupSection.set(key.toLocaleLowerCase(), result);
@@ -393,11 +337,6 @@ exports.defaultSettingGroup = [
         title: '%settings.group.editor%',
         iconClass: (0, ide_core_browser_1.getIcon)('editor'),
     },
-    {
-        id: common_1.PreferenceSettingId.View,
-        title: '%settings.group.view%',
-        iconClass: (0, ide_core_browser_1.getIcon)('detail'),
-    },
     {
         id: common_1.PreferenceSettingId.Terminal,
         title: '%settings.group.terminal%',
@@ -408,24 +347,28 @@ exports.defaultSettingGroup = [
         title: '%settings.group.feature%',
         iconClass: (0, ide_core_browser_1.getIcon)('file-text'),
     },
+    {
+        id: common_1.PreferenceSettingId.View,
+        title: '%settings.group.view%',
+        iconClass: (0, ide_core_browser_1.getIcon)('detail'),
+    },
 ];
 exports.defaultSettingSections = {
-    [common_1.PreferenceSettingId.General]: [
+    general: [
         {
             preferences: [
-                { id: 'general.theme', i18n: 'preference.general.theme' },
-                { id: 'general.icon', i18n: 'preference.general.icon' },
+                { id: 'general.theme', localized: 'preference.general.theme' },
+                { id: 'general.icon', localized: 'preference.general.icon' },
                 {
                     id: 'general.language',
-                    i18n: 'preference.general.language',
+                    localized: 'preference.general.language',
                     hiddenInScope: [ide_core_browser_1.PreferenceScope.Workspace],
                 },
             ],
         },
     ],
-    [common_1.PreferenceSettingId.Editor]: [
+    editor: [
         {
-            title: 'Editor',
             preferences: [
                 // 预览模式
                 { id: 'editor.previewMode' },
@@ -433,21 +376,23 @@ exports.defaultSettingSections = {
                     id: 'editor.enablePreviewFromCodeNavigation',
                 },
                 // 自动保存
-                { id: 'editor.autoSave', i18n: 'preference.editor.autoSave' },
-                { id: 'editor.autoSaveDelay', i18n: 'preference.editor.autoSaveDelay' },
+                { id: 'editor.autoSave', localized: 'preference.editor.autoSave' },
+                { id: 'editor.autoSaveDelay', localized: 'preference.editor.autoSaveDelay' },
                 {
                     id: 'workbench.refactoringChanges.showPreviewStrategy',
-                    i18n: 'preference.workbench.refactoringChanges.showPreviewStrategy.title',
+                    localized: 'preference.workbench.refactoringChanges.showPreviewStrategy.title',
                 },
-                { id: 'editor.askIfDiff', i18n: 'preference.editor.askIfDiff' },
+                { id: 'editor.askIfDiff', localized: 'preference.editor.askIfDiff' },
                 // 光标样式
-                { id: 'editor.cursorStyle', i18n: 'preference.editor.cursorStyle' },
+                { id: 'editor.cursorStyle', localized: 'preference.editor.cursorStyle' },
                 // 字体
-                { id: 'editor.fontSize', i18n: 'preference.editor.fontSize' },
-                { id: 'editor.fontWeight', i18n: 'preference.editor.fontWeight' },
-                { id: 'editor.fontFamily', i18n: 'preference.editor.fontFamily' },
-                { id: 'editor.lineHeight', i18n: 'preference.editor.lineHeight' },
+                { id: 'editor.fontSize', localized: 'preference.editor.fontSize' },
+                { id: 'editor.fontWeight', localized: 'preference.editor.fontWeight' },
+                { id: 'editor.fontFamily', localized: 'preference.editor.fontFamily' },
+                { id: 'editor.lineHeight', localized: 'preference.editor.lineHeight' },
                 { id: 'editor.trimAutoWhitespace' },
+                // workbench
+                { id: 'workbench.editorAssociations' },
                 // 补全
                 { id: 'editor.suggest.insertMode' },
                 { id: 'editor.suggest.filterGraceful' },
@@ -487,102 +432,104 @@ exports.defaultSettingSections = {
                 { id: 'editor.suggest.preview' },
                 { id: 'editor.suggest.details.visible' },
                 // Guides
-                { id: 'editor.guides.bracketPairs', i18n: 'preference.editor.guides.bracketPairs' },
-                { id: 'editor.guides.indentation', i18n: 'preference.editor.guides.indentation' },
+                { id: 'editor.guides.bracketPairs', localized: 'preference.editor.guides.bracketPairs' },
+                { id: 'editor.guides.indentation', localized: 'preference.editor.guides.indentation' },
                 {
                     id: 'editor.guides.highlightActiveIndentation',
-                    i18n: 'preference.editor.guides.highlightActiveIndentation',
+                    localized: 'preference.editor.guides.highlightActiveIndentation',
                 },
                 // 行内补全
-                { id: 'editor.inlineSuggest.enabled', i18n: 'preference.editor.inlineSuggest.enabled' },
+                { id: 'editor.inlineSuggest.enabled', localized: 'preference.editor.inlineSuggest.enabled' },
                 {
                     id: 'editor.experimental.stickyScroll.enabled',
-                    i18n: 'preference.editor.experimental.stickyScroll.enabled',
+                    localized: 'preference.editor.experimental.stickyScroll.enabled',
                 },
                 // 缩进
-                { id: 'editor.detectIndentation', i18n: 'preference.editor.detectIndentation' },
-                { id: 'editor.tabSize', i18n: 'preference.editor.tabSize' },
-                { id: 'editor.insertSpaces', i18n: 'preference.editor.insertSpace' },
+                { id: 'editor.detectIndentation', localized: 'preference.editor.detectIndentation' },
+                { id: 'editor.tabSize', localized: 'preference.editor.tabSize' },
+                { id: 'editor.insertSpaces', localized: 'preference.editor.insertSpace' },
                 // 显示
-                { id: 'editor.wrapTab', i18n: 'preference.editor.wrapTab' },
-                { id: 'editor.wordWrap', i18n: 'preference.editor.wordWrap' },
-                { id: 'editor.renderLineHighlight', i18n: 'preference.editor.renderLineHighlight' },
-                { id: 'editor.renderWhitespace', i18n: 'preference.editor.renderWhitespace' },
-                { id: 'editor.minimap', i18n: 'preference.editor.minimap' },
+                { id: 'editor.wrapTab', localized: 'preference.editor.wrapTab' },
+                { id: 'editor.wordWrap', localized: 'preference.editor.wordWrap' },
+                { id: 'editor.renderLineHighlight', localized: 'preference.editor.renderLineHighlight' },
+                { id: 'editor.renderWhitespace', localized: 'preference.editor.renderWhitespace' },
+                { id: 'editor.minimap', localized: 'preference.editor.minimap' },
                 // 格式化
-                { id: 'editor.preferredFormatter', i18n: 'preference.editor.preferredFormatter' },
-                { id: 'editor.formatOnSave', i18n: 'preference.editor.formatOnSave' },
-                { id: 'editor.formatOnSaveTimeout', i18n: 'preference.editor.formatOnSaveTimeout' },
-                { id: 'editor.formatOnPaste', i18n: 'preference.editor.formatOnPaste' },
+                { id: 'editor.preferredFormatter', localized: 'preference.editor.preferredFormatter' },
+                { id: 'editor.formatOnSave', localized: 'preference.editor.formatOnSave' },
+                { id: 'editor.formatOnSaveTimeout', localized: 'preference.editor.formatOnSaveTimeout' },
+                { id: 'editor.formatOnPaste', localized: 'preference.editor.formatOnPaste' },
                 // 智能提示
-                { id: 'editor.quickSuggestionsDelay', i18n: 'preference.editor.quickSuggestionsDelay' },
+                { id: 'editor.quickSuggestionsDelay', localized: 'preference.editor.quickSuggestionsDelay' },
                 // 文件
                 // `forceReadOnly` 选项暂时不对用户暴露
                 // {id: 'editor.forceReadOnly', localized: 'preference.editor.forceReadOnly'},
-                { id: 'editor.maxTokenizationLineLength', i18n: 'preference.editor.maxTokenizationLineLength' },
-                { id: 'editor.largeFile', i18n: 'preference.editor.largeFile' },
-                { id: 'editor.readonlyFiles', i18n: 'preference.editor.readonlyFiles' },
+                { id: 'editor.maxTokenizationLineLength', localized: 'preference.editor.maxTokenizationLineLength' },
+                { id: 'editor.largeFile', localized: 'preference.editor.largeFile' },
+                { id: 'editor.readonlyFiles', localized: 'preference.editor.readonlyFiles' },
                 {
                     id: 'editor.bracketPairColorization.enabled',
-                    i18n: 'preference.editor.bracketPairColorization.enabled',
+                    localized: 'preference.editor.bracketPairColorization.enabled',
                 },
-                { id: 'workbench.editorAssociations' },
-            ],
-        },
-        {
-            title: 'Diff Editor',
-            preferences: [
                 // Diff 编辑器
-                { id: 'diffEditor.renderSideBySide', i18n: 'preference.diffEditor.renderSideBySide' },
-                { id: 'diffEditor.ignoreTrimWhitespace', i18n: 'preference.diffEditor.ignoreTrimWhitespace' },
-            ],
-        },
-        {
-            title: 'Files',
-            preferences: [
-                { id: 'files.autoGuessEncoding', i18n: 'preference.files.autoGuessEncoding.title' },
-                { id: 'files.encoding', i18n: 'preference.files.encoding.title' },
+                { id: 'diffEditor.renderSideBySide', localized: 'preference.diffEditor.renderSideBySide' },
+                { id: 'diffEditor.ignoreTrimWhitespace', localized: 'preference.diffEditor.ignoreTrimWhitespace' },
+                { id: 'files.autoGuessEncoding', localized: 'preference.files.autoGuessEncoding.title' },
+                { id: 'files.encoding', localized: 'preference.files.encoding.title' },
                 { id: 'files.eol' },
                 { id: 'files.trimFinalNewlines' },
                 { id: 'files.trimTrailingWhitespace' },
                 { id: 'files.insertFinalNewline' },
-                { id: 'files.exclude', i18n: 'preference.files.exclude.title' },
-                { id: 'files.watcherExclude', i18n: 'preference.files.watcherExclude.title' },
-                { id: 'files.associations', i18n: 'preference.files.associations.title' },
+                { id: 'files.exclude', localized: 'preference.files.exclude.title' },
+                { id: 'files.watcherExclude', localized: 'preference.files.watcherExclude.title' },
+                { id: 'files.associations', localized: 'preference.files.associations.title' },
             ],
         },
     ],
-    // 整体布局相关的，比如 QuickOpen 也放这
-    [common_1.PreferenceSettingId.View]: [
+    terminal: [
         {
-            // 布局信息
-            title: 'Layout',
-            preferences: [{ id: 'view.saveLayoutWithWorkspace', i18n: 'preference.view.saveLayoutWithWorkspace.title' }],
-        },
-        {
-            title: 'File Tree',
-            preferences: [],
-        },
-        {
-            // 资源管理器
-            title: 'Explorer',
             preferences: [
-                { id: 'explorer.fileTree.baseIndent', i18n: 'preference.explorer.fileTree.baseIndent.title' },
-                { id: 'explorer.fileTree.indent', i18n: 'preference.explorer.fileTree.indent.title' },
-                { id: 'explorer.compactFolders', i18n: 'preference.explorer.compactFolders.title' },
-                { id: 'explorer.autoReveal', i18n: 'preference.explorer.autoReveal' },
+                // 终端类型
+                { id: "terminal.type" /* Type */, localized: 'preference.terminal.type' },
+                // 字体
+                { id: "terminal.fontFamily" /* FontFamily */, localized: 'preference.terminal.fontFamily' },
+                { id: "terminal.fontSize" /* FontSize */, localized: 'preference.terminal.fontSize' },
+                { id: "terminal.fontWeight" /* FontWeight */, localized: 'preference.terminal.fontWeight' },
+                { id: "terminal.lineHeight" /* LineHeight */, localized: 'preference.terminal.lineHeight' },
+                // 光标
+                { id: "terminal.cursorBlink" /* CursorBlink */, localized: 'preference.terminal.cursorBlink' },
+                // 显示
+                { id: "terminal.scrollback" /* Scrollback */, localized: 'preference.terminal.scrollback' },
+                // 命令行参数
+                { id: 'terminal.integrated.shellArgs.linux', localized: 'preference.terminal.integrated.shellArgs.linux' },
+                { id: 'terminal.integrated.copyOnSelection', localized: 'preference.terminal.integrated.copyOnSelection' },
+                // Local echo
+                { id: 'terminal.integrated.localEchoEnabled', localized: 'preference.terminal.integrated.localEchoEnabled' },
+                {
+                    id: 'terminal.integrated.localEchoLatencyThreshold',
+                    localized: 'preference.terminal.integrated.localEchoLatencyThreshold',
+                },
+                {
+                    id: 'terminal.integrated.localEchoExcludePrograms',
+                    localized: 'preference.terminal.integrated.localEchoExcludePrograms',
+                },
+                {
+                    id: 'terminal.integrated.cursorStyle',
+                    localized: 'preference.terminal.integrated.cursorStyle',
+                },
+                { id: 'terminal.integrated.localEchoStyle', localized: 'preference.terminal.integrated.localEchoStyle' },
             ],
         },
+    ],
+    feature: [
         {
-            title: 'QuickOpen',
-            preferences: [{ id: 'workbench.quickOpen.preserveInput' }],
-        },
-        {
-            title: 'Search',
             preferences: [
+                // 树/列表项
+                { id: 'workbench.list.openMode', localized: 'preference.workbench.list.openMode.title' },
+                { id: 'explorer.autoReveal', localized: 'preference.explorer.autoReveal' },
                 // 搜索
                 { id: "search.include" /* Include */ },
-                { id: "search.exclude" /* Exclude */, i18n: 'preference.search.exclude.title' },
+                { id: "search.exclude" /* Exclude */, localized: 'preference.search.exclude.title' },
                 { id: "search.useReplacePreview" /* UseReplacePreview */ },
                 // { id: 'search.maxResults' },
                 { id: "search.searchOnType" /* SearchOnType */ },
@@ -594,74 +541,31 @@ exports.defaultSettingSections = {
                 // { id: 'search.useParentIgnoreFiles' },
                 // { id: 'search.quickOpen.includeHistory' },
                 // { id: 'search.quickOpen.includeSymbols' },
-            ],
-        },
-        {
-            title: 'Output',
-            preferences: [
                 // 输出
-                { id: 'output.maxChannelLine', i18n: 'output.maxChannelLine' },
-                { id: 'output.enableLogHighlight', i18n: 'output.enableLogHighlight' },
-                { id: 'output.enableSmartScroll', i18n: 'output.enableSmartScroll' },
-            ],
-        },
-        {
-            title: 'Debug',
-            preferences: [
+                { id: 'output.maxChannelLine', localized: 'output.maxChannelLine' },
+                { id: 'output.enableLogHighlight', localized: 'output.enableLogHighlight' },
+                { id: 'output.enableSmartScroll', localized: 'output.enableSmartScroll' },
                 // 调试
                 // 由于筛选器的匹配模式搜索存在性能、匹配难度大等问题，先暂时隐藏
                 // { id: 'debug.console.filter.mode', localized: 'preference.debug.console.filter.mode' },
-                { id: 'debug.console.wordWrap', i18n: 'preference.debug.console.wordWrap' },
-                { id: 'debug.inline.values', i18n: 'preference.debug.inline.values' },
-                { id: 'debug.toolbar.float', i18n: 'preference.debug.toolbar.float.title' },
+                { id: 'debug.console.wordWrap', localized: 'preference.debug.console.wordWrap' },
+                { id: 'debug.inline.values', localized: 'preference.debug.inline.values' },
             ],
         },
     ],
-    [common_1.PreferenceSettingId.Terminal]: [
+    view: [
         {
             preferences: [
-                // 终端类型
-                { id: "terminal.type" /* Type */, i18n: 'preference.terminal.type' },
-                // 字体
-                { id: "terminal.fontFamily" /* FontFamily */, i18n: 'preference.terminal.fontFamily' },
-                { id: "terminal.fontSize" /* FontSize */, i18n: 'preference.terminal.fontSize' },
-                { id: "terminal.fontWeight" /* FontWeight */, i18n: 'preference.terminal.fontWeight' },
-                { id: "terminal.lineHeight" /* LineHeight */, i18n: 'preference.terminal.lineHeight' },
-                // 光标
-                { id: "terminal.cursorBlink" /* CursorBlink */, i18n: 'preference.terminal.cursorBlink' },
-                // 显示
-                { id: "terminal.scrollback" /* Scrollback */, i18n: 'preference.terminal.scrollback' },
-                // 命令行参数
-                { id: 'terminal.integrated.shellArgs.linux', i18n: 'preference.terminal.integrated.shellArgs.linux' },
-                { id: 'terminal.integrated.copyOnSelection', i18n: 'preference.terminal.integrated.copyOnSelection' },
-                // Local echo
-                { id: 'terminal.integrated.localEchoEnabled', i18n: 'preference.terminal.integrated.localEchoEnabled' },
-                {
-                    id: 'terminal.integrated.localEchoLatencyThreshold',
-                    i18n: 'preference.terminal.integrated.localEchoLatencyThreshold',
-                },
-                {
-                    id: 'terminal.integrated.localEchoExcludePrograms',
-                    i18n: 'preference.terminal.integrated.localEchoExcludePrograms',
-                },
-                {
-                    id: 'terminal.integrated.cursorStyle',
-                    i18n: 'preference.terminal.integrated.cursorStyle',
-                },
-                { id: 'terminal.integrated.localEchoStyle', i18n: 'preference.terminal.integrated.localEchoStyle' },
+                // 资源管理器
+                { id: 'explorer.fileTree.baseIndent', localized: 'preference.explorer.fileTree.baseIndent.title' },
+                { id: 'explorer.fileTree.indent', localized: 'preference.explorer.fileTree.indent.title' },
+                { id: 'explorer.compactFolders', localized: 'preference.explorer.compactFolders.title' },
+                // 运行与调试
+                { id: 'debug.toolbar.float', localized: 'preference.debug.toolbar.float.title' },
+                // 布局信息
+                { id: 'view.saveLayoutWithWorkspace', localized: 'preference.view.saveLayoutWithWorkspace.title' },
             ],
         },
     ],
-    [common_1.PreferenceSettingId.Feature]: [
-        {
-            title: 'Misc',
-            preferences: [],
-        },
-        {
-            // 树/列表项
-            title: 'Tree Component',
-            preferences: [{ id: 'workbench.list.openMode', i18n: 'preference.workbench.list.openMode.title' }],
-        },
-    ],
 };
 //# sourceMappingURL=preference-settings.service.js.map