@opensumi/ide-preferences 2.27.3-rc-1708395495.0 → 2.27.3-rc-1710386185.0

package/src/browser/index.ts

@@ -1,18 +1,18 @@
-import { Provider, Injector, Injectable } from '@opensumi/di';
+import { Injectable, Injector, Provider } from '@opensumi/di';
 import { BrowserModule } from '@opensumi/ide-core-browser';
 import {
-  PreferenceScope,
+  IPreferenceSettingsService,
   PreferenceConfigurations,
   PreferenceProvider,
-  IPreferenceSettingsService,
+  PreferenceScope,
 } from '@opensumi/ide-core-browser/lib/preferences';
 
 import { IUserStorageService, SettingContribution } from '../common';
 
 import {
+  FolderFilePreferenceProvider,
   FolderFilePreferenceProviderFactory,
   FolderFilePreferenceProviderOptions,
-  FolderFilePreferenceProvider,
 } from './folder-file-preference-provider';
 import { FoldersPreferencesProvider } from './folders-preferences-provider';
 import { PreferenceContribution } from './preference-contribution';
@@ -20,9 +20,9 @@ import { PreferenceSettingsService } from './preference-settings.service';
 import { UserPreferenceProvider } from './user-preference-provider';
 import { UserStorageContribution, UserStorageServiceImpl } from './userstorage';
 import {
+  WorkspaceFilePreferenceProvider,
   WorkspaceFilePreferenceProviderFactory,
   WorkspaceFilePreferenceProviderOptions,
-  WorkspaceFilePreferenceProvider,
 } from './workspace-file-preference-provider';
 import { WorkspacePreferenceProvider } from './workspace-preference-provider';
 

package/src/browser/preference-contribution.ts

@@ -1,38 +1,38 @@
 import * as jsoncParser from 'jsonc-parser';
 
-import { Autowired, Injectable, INJECTOR_TOKEN, Injector } from '@opensumi/di';
+import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
 import {
+  COMMON_COMMANDS,
   ClientAppContribution,
-  PreferenceSchemaProvider,
-  URI,
-  Domain,
+  CodeSchemaId,
+  Command,
   CommandContribution,
   CommandRegistry,
-  COMMON_COMMANDS,
-  KeybindingContribution,
-  KeybindingRegistry,
-  PreferenceScope,
-  PreferenceProvider,
-  WithEventBus,
-  MaybePromise,
-  localize,
   CommandService,
+  ContributionProvider,
+  Domain,
   EDITOR_COMMANDS,
-  JsonSchemaContribution,
+  IDisposable,
   IJSONSchemaRegistry,
   IPreferenceSettingsService,
-  ContributionProvider,
   ISettingGroup,
-  IDisposable,
+  ISettingSection,
+  JsonSchemaContribution,
+  KeybindingContribution,
+  KeybindingRegistry,
+  MaybePromise,
+  PreferenceProvider,
+  PreferenceSchemaProvider,
+  PreferenceScope,
+  URI,
+  WithEventBus,
   arrays,
-  Command,
   getIcon,
   isString,
-  ISettingSection,
-  CodeSchemaId,
+  localize,
 } from '@opensumi/ide-core-browser';
-import { MenuContribution, IMenuRegistry, MenuId } from '@opensumi/ide-core-browser/lib/menu/next';
-import { ResourceService, IResourceProvider, IResource } from '@opensumi/ide-editor';
+import { IMenuRegistry, MenuContribution, MenuId } from '@opensumi/ide-core-browser/lib/menu/next';
+import { IResource, IResourceProvider, ResourceService } from '@opensumi/ide-editor';
 import {
   BrowserEditorContribution,
   EditorComponentRegistry,

package/src/browser/preference-settings.service.ts

@@ -1,40 +1,40 @@
-import { observable, action, computed, makeObservable } from 'mobx';
-
-import { Injectable, Autowired } from '@opensumi/di';
+import { Autowired, Injectable } from '@opensumi/di';
+import { EventEmitter } from '@opensumi/events';
 import { IBasicRecycleTreeHandle } from '@opensumi/ide-components';
 import { IVirtualListHandle } from '@opensumi/ide-components/lib/virtual-list/types';
 import {
-  IPreferenceViewDesc,
+  CommandService,
+  Dispatcher,
+  Disposable,
+  Emitter,
+  Event,
+  IDisposable,
   IPreferenceSettingsService,
+  IPreferenceViewDesc,
+  IResolvedPreferenceViewDesc,
+  IResolvedSettingSection,
   ISettingGroup,
   ISettingSection,
-  PreferenceProviderProvider,
-  Emitter,
-  Dispatcher,
-  Event,
-  CommandService,
-  isString,
-  getIcon,
-  PreferenceScope,
+  MenubarSettingId,
   PreferenceProvider,
+  PreferenceProviderProvider,
   PreferenceSchemaProvider,
-  IDisposable,
-  arrays,
-  getAvailableLanguages,
+  PreferenceScope,
+  PreferenceScopeWithLabel,
   PreferenceService,
-  replaceLocalizePlaceholder,
   TerminalSettingsId,
-  IResolvedPreferenceViewDesc,
-  IResolvedSettingSection,
-  Disposable,
   UserScope,
   WorkspaceScope,
-  MenubarSettingId,
+  arrays,
+  getAvailableLanguages,
+  getIcon,
+  isString,
+  replaceLocalizePlaceholder,
 } from '@opensumi/ide-core-browser';
 import { SearchSettingId } from '@opensumi/ide-core-common/lib/settings/search';
 import { IFileServiceClient } from '@opensumi/ide-file-service';
 
-import { toPreferenceReadableName, PreferenceSettingId, getPreferenceItemLabel, ESectionItemKind } from '../common';
+import { ESectionItemKind, PreferenceSettingId, getPreferenceItemLabel, toPreferenceReadableName } from '../common';
 
 import { PREFERENCE_COMMANDS } from './preference-contribution';
 
@@ -73,36 +73,41 @@ export class PreferenceSettingsService extends Disposable implements IPreference
   @Autowired(CommandService)
   protected readonly commandService: CommandService;
 
-  private onSettingsGroupsChangeEmitter: Emitter<void> = this.registerDispose(new Emitter());
-  public readonly onSettingsGroupsChange: Event<void> = this.onSettingsGroupsChangeEmitter.event;
-
-  @observable
-  public currentSearch = '';
+  emitter = this.registerDispose(
+    new EventEmitter<{
+      currentSearchChange: [void];
+      settingsGroupsChange: [void];
+      currentSelectIdChange: [string];
+      tabListChange: [void];
+      tabIndexChange: [];
+      currentScopeChange: [];
+      settingsSectionsChange: [groupId: string];
+    }>(),
+  );
+
+  currentSearch = '';
+  tabIndex = 0;
+  tabList = [WorkspaceScope, UserScope] as PreferenceScopeWithLabel[];
 
-  @observable
-  currentSelectId = '';
+  protected _currentScope: PreferenceScopeWithLabel = this.tabList[0];
 
-  @observable
-  private userBeforeWorkspace = false;
+  get currentScope() {
+    return this._currentScope.id;
+  }
 
-  @observable
-  tabIndex = 0;
+  protected _currentSelectId = '';
 
-  @computed
-  get tabList() {
-    return this.userBeforeWorkspace ? [UserScope, WorkspaceScope] : [WorkspaceScope, UserScope];
+  get currentSelectId() {
+    return this._currentSelectId;
   }
 
-  @computed
-  get currentScope() {
-    const scope = this.tabList[this.tabIndex];
-    return scope.id;
+  set currentSelectId(id: string) {
+    this._currentSelectId = id;
+    this.emitter.emit('currentSelectIdChange', id);
   }
 
-  @observable
   settingsGroups: ISettingGroup[] = [];
 
-  @observable
   settingsSections: Map<string, ISettingSection[]> = new Map();
   private settingsSectionsVersioned: Versionizer<string> = new Versionizer();
 
@@ -116,7 +121,6 @@ export class PreferenceSettingsService extends Disposable implements IPreference
 
   constructor() {
     super();
-    makeObservable(this);
     this.setEnumLabels(
       'general.language',
       new Proxy(
@@ -131,42 +135,71 @@ export class PreferenceSettingsService extends Disposable implements IPreference
       '\r\n': 'CRLF',
       auto: 'auto',
     });
-    this.userBeforeWorkspace = this.preferenceService.get<boolean>('settings.userBeforeWorkspace', false);
 
-    this.registerDispose(
+    const userBeforeWorkspace = this.preferenceService.get<boolean>('settings.userBeforeWorkspace', false);
+    if (userBeforeWorkspace) {
+      this.updateTabList(userBeforeWorkspace);
+    }
+
+    this.addDispose([
       this.preferenceService.onSpecificPreferenceChange('settings.userBeforeWorkspace', (e) => {
-        this.userBeforeWorkspace = e.newValue;
+        this.updateTabList(e.newValue);
       }),
-    );
+      this.emitter.on('tabListChange', () => {
+        this.updateCurrentScope();
+      }),
+      this.emitter.on('tabIndexChange', () => {
+        this.updateCurrentScope();
+      }),
+    ]);
+  }
+
+  updateTabList(userBeforeWorkspace: boolean) {
+    let tabList: PreferenceScopeWithLabel[];
+    if (userBeforeWorkspace) {
+      tabList = [UserScope, WorkspaceScope];
+    } else {
+      tabList = [WorkspaceScope, UserScope];
+    }
+
+    this.tabList = tabList;
+    this.emitter.emit('tabListChange');
+  }
+
+  protected updateCurrentScope() {
+    this._currentScope = this.tabList[this.tabIndex];
+    this.emitter.emit('currentScopeChange');
   }
 
-  @action
   scrollToGroup(groupId: string): void {
     if (groupId) {
       this.currentSelectId = ESectionItemKind.Group + groupId;
     }
   }
-  @action
+
   scrollToSection(section: string): void {
     if (section) {
       this.currentSelectId = ESectionItemKind.Section + section;
     }
   }
-  @action
+
   scrollToPreference(preferenceId: string): void {
     if (preferenceId) {
       this.currentSelectId = ESectionItemKind.Preference + preferenceId;
     }
   }
 
-  @action.bound
+  updateTabIndex(index: number) {
+    this.tabIndex = index;
+    this.emitter.emit('tabIndexChange');
+  }
+
   selectScope(scope: PreferenceScope) {
-    // 利用副作用强制刷新一下
     let index = this.tabList.findIndex((v) => v.id === scope);
     if (index === -1) {
       index = 0;
     }
-    this.tabIndex = index;
+    this.updateTabIndex(index);
   }
 
   onDidEnumLabelsChange(id: string) {
@@ -186,13 +219,14 @@ export class PreferenceSettingsService extends Disposable implements IPreference
     return Array.isArray(v.hiddenInScope) && v.hiddenInScope.includes(scope);
   }
 
-  @action
   private doSearch(value?: string) {
     if (value) {
       this.currentSearch = value;
     } else {
       this.currentSearch = '';
     }
+
+    this.emitter.emit('currentSearchChange');
   }
 
   openJSON = (scope: PreferenceScope, preferenceId: string) => {
@@ -254,10 +288,10 @@ export class PreferenceSettingsService extends Disposable implements IPreference
       ...group,
       title: replaceLocalizePlaceholder(group.title) || group.title,
     });
-    this.onSettingsGroupsChangeEmitter.fire();
+    this.emitter.emit('settingsGroupsChange');
     return Disposable.create(() => {
       disposable.dispose();
-      this.onSettingsGroupsChangeEmitter.fire();
+      this.emitter.emit('settingsGroupsChange');
     });
   }
 
@@ -273,10 +307,12 @@ export class PreferenceSettingsService extends Disposable implements IPreference
     this.cachedGroupSection.clear();
     const disposable = addElement(this.settingsSections.get(groupId)!, section);
     this.settingsSectionsVersioned.increase(groupId);
+    this.emitter.emit('settingsSectionsChange', groupId);
     return {
       dispose: () => {
         disposable.dispose();
         this.settingsSectionsVersioned.increase(groupId);
+        this.emitter.emit('settingsSectionsChange', groupId);
       },
     };
   }
@@ -563,6 +599,7 @@ export const defaultSettingSections: {
       preferences: [
         { id: 'general.theme', localized: 'preference.general.theme' },
         { id: 'general.icon', localized: 'preference.general.icon' },
+        { id: 'general.productIconTheme', localized: 'preference.general.productIconTheme' },
         {
           id: 'general.language',
           localized: 'preference.general.language',
@@ -648,6 +685,7 @@ export const defaultSettingSections: {
         { id: 'editor.suggest.details.visible' },
         // 行内补全
         { id: 'editor.inlineSuggest.enabled', localized: 'preference.editor.inlineSuggest.enabled' },
+        { id: 'editor.inlineSuggest.showToolbar' },
         {
           id: 'editor.experimental.stickyScroll.enabled',
           localized: 'preference.editor.experimental.stickyScroll.enabled',

package/src/browser/preference-widgets.ts

@@ -10,7 +10,7 @@ import {
   MenuCommandDesc,
   MenuId,
 } from '@opensumi/ide-core-browser/lib/menu/next';
-import { CommandRegistry, Disposable, IDisposable, localize, PreferenceScope, URI } from '@opensumi/ide-core-common';
+import { CommandRegistry, Disposable, IDisposable, PreferenceScope, URI, localize } from '@opensumi/ide-core-common';
 import { IEditor, IEditorDocumentModelService, IEditorFeatureContribution } from '@opensumi/ide-editor/lib/browser';
 import { IFileServiceClient } from '@opensumi/ide-file-service';
 import { MarkdownString } from '@opensumi/monaco-editor-core/esm/vs/base/common/htmlContent';

package/src/browser/preferenceItem.view.tsx

@@ -2,25 +2,25 @@ import cls from 'classnames';
 import debounce from 'lodash/debounce';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
-import { Injectable, Autowired } from '@opensumi/di';
+import { Autowired, Injectable } from '@opensumi/di';
 import { Button, CheckBox, Input, Option, Select, ValidateInput, ValidateMessage } from '@opensumi/ide-components';
-import { DefaultMarkedRenderer, linkify, Markdown } from '@opensumi/ide-components/lib/markdown/index';
+import { DefaultMarkedRenderer, Markdown, linkify } from '@opensumi/ide-components/lib/markdown/index';
 import {
   DisposableCollection,
-  getIcon,
+  ILogger,
+  IOpenerService,
   IPreferenceSettingsService,
-  localize,
+  IResolvedPreferenceViewDesc,
   PreferenceItem,
   PreferenceProvider,
   PreferenceSchemaProvider,
   PreferenceScope,
   PreferenceService,
+  formatLocalize,
+  getIcon,
+  localize,
   replaceLocalizePlaceholder,
   useInjectable,
-  formatLocalize,
-  ILogger,
-  IOpenerService,
-  IResolvedPreferenceViewDesc,
 } from '@opensumi/ide-core-browser';
 
 import { getPreferenceItemLabel, knownPrefIdMappings } from '../common';