@opensumi/ide-editor 2.27.3-rc-1708399099.0 → 2.27.3-rc-1710489030.0

package/src/browser/editor-collection.service.ts

@@ -1,51 +1,48 @@
-import { Injectable, Autowired, INJECTOR_TOKEN, Injector } from '@opensumi/di';
-import { IRange, IContextKeyService } from '@opensumi/ide-core-browser';
+import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
+import { IContextKeyService, IRange } from '@opensumi/ide-core-browser';
 import { ResourceContextKey } from '@opensumi/ide-core-browser/lib/contextkey';
 import { MonacoService } from '@opensumi/ide-core-browser/lib/monaco';
 import {
+  Disposable,
+  Emitter,
+  Emitter as EventEmitter,
   ILineChange,
+  ISelection,
+  OnEvent,
   URI,
   WithEventBus,
-  OnEvent,
-  Emitter as EventEmitter,
-  ISelection,
-  Disposable,
-  objects,
   isEmptyObject,
+  objects,
 } from '@opensumi/ide-core-common';
-import { Emitter } from '@opensumi/ide-core-common';
-import type {
-  ICodeEditor as IMonacoCodeEditor,
-  IDiffEditor as IMonacoDiffEditor,
-} from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
-import type { IDiffEditorConstructionOptions } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
 import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
 import { IConfigurationService } from '@opensumi/monaco-editor-core/esm/vs/platform/configuration/common/configuration';
 
 import {
-  ICodeEditor,
-  IEditor,
-  EditorCollectionService,
-  IDiffEditor,
-  ResourceDecorationNeedChangeEvent,
   CursorStatus,
-  IUndoStopOptions,
-  IDecorationApplyOptions,
+  EditorCollectionService,
   EditorType,
+  ICodeEditor,
+  IDecorationApplyOptions,
+  IDiffEditor,
+  IEditor,
   IResourceOpenOptions,
+  IUndoStopOptions,
+  ResourceDecorationNeedChangeEvent,
 } from '../common';
+import { IEditorDocumentModel, IEditorDocumentModelRef } from '../common/editor';
 
 import { MonacoEditorDecorationApplier } from './decoration-applier';
-import {
-  IEditorDocumentModelRef,
-  EditorDocumentModelContentChangedEvent,
-  IEditorDocumentModelService,
-  IEditorDocumentModel,
-} from './doc-model/types';
+import { EditorDocumentModelContentChangedEvent, IEditorDocumentModelService } from './doc-model/types';
 import { EditorFeatureRegistryImpl } from './feature';
-import { getConvertedMonacoOptions, isEditorOption, isDiffEditorOption } from './preference/converter';
+import { getConvertedMonacoOptions, isDiffEditorOption, isEditorOption } from './preference/converter';
 import { IEditorFeatureRegistry } from './types';
 
+import type {
+  ICodeEditor as IMonacoCodeEditor,
+  IDiffEditor as IMonacoDiffEditor,
+} from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
+import type { IDiffEditorConstructionOptions } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
+
 const { removeUndefined } = objects;
 
 @Injectable()
@@ -286,7 +283,7 @@ export abstract class BaseMonacoEditorWrapper extends WithEventBus implements IE
     );
     this.addDispose(
       this.configurationService.onDidChangeConfiguration((e) => {
-        const changedEditorKeys = e.affectedKeys.filter((key) => isEditorOption(key));
+        const changedEditorKeys = Array.from(e.affectedKeys.values()).filter((key) => isEditorOption(key));
         if (changedEditorKeys.length > 0) {
           this._doUpdateOptions();
         }
@@ -620,7 +617,7 @@ export class BrowserDiffEditor extends WithEventBus implements IDiffEditor {
     this.wrapEditors();
     this.addDispose(
       this.configurationService.onDidChangeConfiguration((e) => {
-        const changedEditorKeys = e.affectedKeys.filter((key) => isDiffEditorOption(key));
+        const changedEditorKeys = Array.from(e.affectedKeys.values()).filter((key) => isDiffEditorOption(key));
         if (changedEditorKeys.length > 0) {
           this.doUpdateDiffOptions();
         }

package/src/browser/editor-electron.contribution.ts

@@ -1,17 +1,17 @@
 import { Autowired, INJECTOR_TOKEN, Injector } from '@opensumi/di';
 import {
-  IClientApp,
   ClientAppContribution,
+  Domain,
+  EDITOR_COMMANDS,
+  IClientApp,
   KeybindingContribution,
   KeybindingRegistry,
-  EDITOR_COMMANDS,
-  Domain,
   electronEnv,
 } from '@opensumi/ide-core-browser';
-import { isOSX, OnEvent, WithEventBus } from '@opensumi/ide-core-common';
+import { OnEvent, WithEventBus, isOSX } from '@opensumi/ide-core-common';
 import { IElectronMainUIService } from '@opensumi/ide-core-common/lib/electron';
 
-import { WorkbenchEditorService, IDocPersistentCacheProvider } from '../common';
+import { IDocPersistentCacheProvider, WorkbenchEditorService } from '../common';
 
 import { IEditorDocumentModelContentRegistry } from './doc-model/types';
 import { ResourceDecorationChangeEvent } from './types';

package/src/browser/editor-opener.ts

@@ -1,7 +1,7 @@
 import { Autowired, Injectable } from '@opensumi/di';
-import { IOpener, URI, IRange } from '@opensumi/ide-core-browser';
+import { IOpener, IRange, URI } from '@opensumi/ide-core-browser';
 
-import { WorkbenchEditorService, ResourceService } from '../common';
+import { ResourceService, WorkbenchEditorService } from '../common';
 
 @Injectable()
 export class EditorOpener implements IOpener {

package/src/browser/editor.contribution.ts

@@ -1,48 +1,47 @@
 import { Autowired, INJECTOR_TOKEN, Injector } from '@opensumi/di';
 import {
-  IClientApp,
+  AppConfig,
   ClientAppContribution,
-  KeybindingContribution,
-  KeybindingRegistry,
-  EDITOR_COMMANDS,
   CommandContribution,
   CommandRegistry,
-  URI,
-  Domain,
-  localize,
-  formatLocalize,
-  MonacoService,
-  ServiceNames,
-  MonacoContribution,
   CommandService,
-  QuickPickService,
-  IEventBus,
-  Schemes,
-  PreferenceService,
+  CorePreferences,
   Disposable,
-  IPreferenceSettingsService,
-  OpenerContribution,
-  IOpenerService,
+  Domain,
+  EDITOR_COMMANDS,
+  FILE_COMMANDS,
+  IClientApp,
   IClipboardService,
-  QuickOpenContribution,
+  IContextKeyService,
+  IEventBus,
+  IOpenerService,
+  IPreferenceSettingsService,
   IQuickOpenHandlerRegistry,
-  PrefixQuickOpenService,
+  KeybindingContribution,
+  KeybindingRegistry,
+  MonacoContribution,
   MonacoOverrideServiceRegistry,
-  IContextKeyService,
-  getLanguageIdFromMonaco,
+  MonacoService,
+  OpenerContribution,
+  PreferenceService,
+  PrefixQuickOpenService,
+  QuickOpenContribution,
   QuickPickItem,
-  AppConfig,
+  QuickPickService,
   SUPPORTED_ENCODINGS,
-  FILE_COMMANDS,
-  CorePreferences,
+  Schemes,
+  ServiceNames,
+  URI,
+  formatLocalize,
+  getLanguageIdFromMonaco,
+  localize,
 } from '@opensumi/ide-core-browser';
 import { ComponentContribution, ComponentRegistry } from '@opensumi/ide-core-browser/lib/layout';
-import { MenuContribution, IMenuRegistry, MenuId } from '@opensumi/ide-core-browser/lib/menu/next';
+import { IMenuRegistry, MenuContribution, MenuId } from '@opensumi/ide-core-browser/lib/menu/next';
 import { AbstractContextMenuService } from '@opensumi/ide-core-browser/lib/menu/next/menu.interface';
 import { ICtxMenuRenderer } from '@opensumi/ide-core-browser/lib/menu/next/renderer/ctxmenu/base';
 import { IRelaxedOpenMergeEditorArgs } from '@opensumi/ide-core-browser/lib/monaco/merge-editor-widget';
-import { isWindows, PreferenceScope, ILogger } from '@opensumi/ide-core-common';
-import { IElectronMainUIService } from '@opensumi/ide-core-common/lib/electron';
+import { ILogger, PreferenceScope, isWindows } from '@opensumi/ide-core-common';
 import { MergeEditorService } from '@opensumi/ide-monaco/lib/browser/contrib/merge-editor/merge-editor.service';
 import { ITextmateTokenizer, ITextmateTokenizerService } from '@opensumi/ide-monaco/lib/browser/contrib/tokenizer';
 import { EOL } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
@@ -52,20 +51,19 @@ import { ContextKeyExpr } from '@opensumi/monaco-editor-core/esm/vs/platform/con
 import { SyncDescriptor } from '@opensumi/monaco-editor-core/esm/vs/platform/instantiation/common/descriptors';
 
 import {
-  WorkbenchEditorService,
-  IResourceOpenOptions,
-  EditorGroupSplitAction,
-  ILanguageService,
   Direction,
+  EditorGroupSplitAction,
   IDocPersistentCacheProvider,
   IEditor,
+  ILanguageService,
+  IResourceOpenOptions,
   SaveReason,
+  WorkbenchEditorService,
 } from '../common';
 import { AUTO_SAVE_MODE } from '../common/editor';
 
 import { MonacoTextModelService } from './doc-model/override';
-import { IEditorDocumentModelService } from './doc-model/types';
-import { IEditorDocumentModelContentRegistry } from './doc-model/types';
+import { IEditorDocumentModelContentRegistry, IEditorDocumentModelService } from './doc-model/types';
 import { EditorOpener } from './editor-opener';
 import { MonacoCodeService, MonacoContextViewService } from './editor.override';
 import { EditorStatusBarService } from './editor.status-bar.service';
@@ -77,10 +75,10 @@ import { EditorContextMenuController } from './menu/editor.context';
 import { NavigationMenuContainer } from './navigation.view';
 import { GoToLineQuickOpenHandler } from './quick-open/go-to-line';
 import { WorkspaceSymbolQuickOpenHandler } from './quick-open/workspace-symbol-quickopen';
-import { EditorGroupsResetSizeEvent, BrowserEditorContribution, IEditorFeatureRegistry } from './types';
+import { BrowserEditorContribution, EditorGroupsResetSizeEvent, IEditorFeatureRegistry } from './types';
 import { EditorSuggestWidgetContribution } from './view/suggest-widget';
 import { EditorTopPaddingContribution } from './view/topPadding';
-import { WorkbenchEditorServiceImpl, EditorGroup } from './workbench-editor.service';
+import { EditorGroup, WorkbenchEditorServiceImpl } from './workbench-editor.service';
 
 interface ResourceArgs {
   group: EditorGroup;
@@ -220,9 +218,6 @@ export class EditorContribution
   @Autowired(ICtxMenuRenderer)
   private readonly contextMenuRenderer: ICtxMenuRenderer;
 
-  @Autowired(IElectronMainUIService)
-  private readonly electronMainUIService: IElectronMainUIService;
-
   registerMonacoDefaultFormattingSelector(register): void {
     const formatSelector = this.injector.get(FormattingSelector);
     register(formatSelector.select.bind(formatSelector));

package/src/browser/editor.decoration.service.ts

@@ -1,20 +1,20 @@
 import { Autowired, Injectable } from '@opensumi/di';
-import { URI, IDisposable, Disposable, IEventBus } from '@opensumi/ide-core-browser';
+import { Disposable, IDisposable, IEventBus, URI } from '@opensumi/ide-core-browser';
 import { IIconService, IThemeService } from '@opensumi/ide-theme';
 import { ICSSStyleService } from '@opensumi/ide-theme/lib/common/style';
 import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
 
-import { IThemeDecorationRenderOptions, IDecorationRenderOptions, IContentDecorationRenderOptions } from '../common';
+import { IContentDecorationRenderOptions, IDecorationRenderOptions, IThemeDecorationRenderOptions } from '../common';
 
 import {
-  IEditorDecorationCollectionService,
+  EditorDecorationChangeEvent,
+  EditorDecorationProviderRegistrationEvent,
+  EditorDecorationTypeRemovedEvent,
   IBrowserTextEditorDecorationType,
   IDynamicModelDecorationProperty,
-  IThemedCssStyle,
+  IEditorDecorationCollectionService,
   IEditorDecorationProvider,
-  EditorDecorationProviderRegistrationEvent,
-  EditorDecorationChangeEvent,
-  EditorDecorationTypeRemovedEvent,
+  IThemedCssStyle,
 } from './types';
 
 @Injectable()

package/src/browser/editor.module.less

@@ -160,6 +160,9 @@
       flex-wrap: wrap;
       width: 100%;
       background: var(--editorGroupHeader-tabsBackground);
+      &.kt_editor_tabs_current_last {
+        display: flex;
+      }
       &::before {
         content: '';
         height: 1px;
@@ -315,6 +318,15 @@
           }
         }
       }
+      &.kt_editor_tab_current_prev {
+        display: flex;
+      }
+      &.kt_editor_tab_current_next {
+        display: flex;
+      }
+      &.kt_editor_tab_dirty {
+        display: flex;
+      }
       &.kt_on_drag_over {
         background-color: var(--editorGroup-dropBackground);
       }

package/src/browser/editor.override.ts

@@ -1,7 +1,7 @@
 import { Autowired, Injectable } from '@opensumi/di';
 import { PreferenceService } from '@opensumi/ide-core-browser';
-import { URI, IRange } from '@opensumi/ide-core-common';
-import type { ICodeEditor as IMonacoCodeEditor } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
+import { IRange, URI } from '@opensumi/ide-core-common';
+import { isEqual } from '@opensumi/monaco-editor-core/esm/vs/base/common/resources';
 import { AbstractCodeEditorService } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/services/abstractCodeEditorService';
 import { ICodeEditorService } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService';
 import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
@@ -9,6 +9,7 @@ import { EditorScopedLayoutService } from '@opensumi/monaco-editor-core/esm/vs/e
 import { StandaloneServices } from '@opensumi/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
 import { IStandaloneThemeService } from '@opensumi/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme';
 import { ContextViewService } from '@opensumi/monaco-editor-core/esm/vs/platform/contextview/browser/contextViewService';
+import { IResourceEditorInput } from '@opensumi/monaco-editor-core/esm/vs/platform/editor/common/editor';
 
 /* istanbul ignore file */
 import { EditorOpenType, WorkbenchEditorService } from '../common';
@@ -16,6 +17,8 @@ import { EditorOpenType, WorkbenchEditorService } from '../common';
 import { BrowserCodeEditor } from './editor-collection.service';
 import { WorkbenchEditorServiceImpl } from './workbench-editor.service';
 
+import type { ICodeEditor as IMonacoCodeEditor } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
+
 @Injectable()
 export class MonacoCodeService extends AbstractCodeEditorService {
   @Autowired(WorkbenchEditorService)
@@ -43,22 +46,17 @@ export class MonacoCodeService extends AbstractCodeEditorService {
    * @param sideBySide ？
    */
   async openCodeEditor(
-    // @ts-ignore
-    input: monaco.editor.IResourceInput,
+    input: IResourceEditorInput,
     source: IMonacoCodeEditor | null,
     sideBySide?: boolean,
   ): Promise<IMonacoCodeEditor | null> {
-    const resourceUri = new URI(input.resource.toString());
+    const resourceUri = input.resource;
     // 判断打开下一个不同于当前编辑器的文件时，是否需要先固定当前编辑器Tab，从而避免被替换，例如：跳转到定义
     const enablePreviewFromCodeNavigation = this.preferenceService.get<boolean>(
       'editor.enablePreviewFromCodeNavigation',
     );
-    if (
-      !enablePreviewFromCodeNavigation &&
-      source &&
-      !sideBySide &&
-      !new URI(source.getModel()?.uri).isEqual(input.resource)
-    ) {
+
+    if (!enablePreviewFromCodeNavigation && source && !sideBySide && isEqual(source.getModel()?.uri, input.resource)) {
       for (const visibleGroup of this.workbenchEditorService.editorGroups) {
         if (visibleGroup.currentOpenType?.type === EditorOpenType.code) {
           if (visibleGroup.currentEditor?.monacoEditor === source) {
@@ -90,6 +88,7 @@ export class MonacoCodeService extends AbstractCodeEditorService {
         index++;
       }
     }
+    // @ts-ignore
     const selection = input.options ? input.options.selection : null;
     let range;
     if (selection) {
@@ -104,13 +103,12 @@ export class MonacoCodeService extends AbstractCodeEditorService {
         );
       }
     }
-    await editorGroup.open(resourceUri, { index, range: range as IRange, focus: true });
+    const openUri = URI.parse(resourceUri.toString());
+    await editorGroup.open(openUri, { index, range: range as IRange, focus: true });
     return (editorGroup.codeEditor as BrowserCodeEditor).monacoEditor;
   }
 }
 
-// @ts-ignore
-
 export class MonacoContextViewService extends ContextViewService {
   private menuContainer: HTMLDivElement;
 

package/src/browser/editor.status-bar.service.ts

@@ -1,9 +1,8 @@
-import { Injectable, Autowired } from '@opensumi/di';
-import { localize, WithEventBus, EDITOR_COMMANDS } from '@opensumi/ide-core-browser';
-import { StatusBarAlignment, IStatusBarService } from '@opensumi/ide-core-browser/lib/services';
-
-import { WorkbenchEditorService, IEditor, CursorStatus, ILanguageService } from '../common';
+import { Autowired, Injectable } from '@opensumi/di';
+import { EDITOR_COMMANDS, WithEventBus, localize } from '@opensumi/ide-core-browser';
+import { IStatusBarService, StatusBarAlignment } from '@opensumi/ide-core-browser/lib/services';
 
+import { CursorStatus, IEditor, ILanguageService, WorkbenchEditorService } from '../common';
 
 import { EditorDocumentModelOptionChangedEvent } from './doc-model/types';
 

package/src/browser/editor.tab.service.ts

@@ -0,0 +1,16 @@
+import { ReactNode } from 'react';
+
+import { Injectable } from '@opensumi/di';
+import { WithEventBus } from '@opensumi/ide-core-browser';
+
+import { IEditorTabService } from './types';
+
+@Injectable()
+export class EditorTabService extends WithEventBus implements IEditorTabService {
+  renderEditorTab(component: ReactNode, isCurrent: boolean): ReactNode {
+    return component;
+  }
+  renderTabCloseComponent(component: ReactNode): ReactNode {
+    return component;
+  }
+}

package/src/browser/editor.view.tsx

@@ -15,8 +15,9 @@ import {
   MaybeNull,
   PreferenceService,
   URI,
-  useDisposable,
   View,
+  useDesignStyles,
+  useDisposable,
 } from '@opensumi/ide-core-browser';
 import {
   IResizeHandleDelegate,
@@ -35,16 +36,16 @@ import { EditorGrid, SplitDirection } from './grid/grid.service';
 import { NavigationBar } from './navigation.view';
 import { Tabs } from './tab.view';
 import {
+  CodeEditorDidVisibleEvent,
   DragOverPosition,
   EditorComponentRegistry,
   EditorComponentRenderMode,
   EditorGroupFileDropEvent,
   EditorGroupsResetSizeEvent,
-  RegisterEditorSideComponentEvent,
+  EditorOpenType,
   EditorSide,
   IEditorComponent,
-  CodeEditorDidVisibleEvent,
-  EditorOpenType,
+  RegisterEditorSideComponentEvent,
   ResoucesOfActiveComponentChangedEvent,
 } from './types';
 import { EditorGroup, WorkbenchEditorServiceImpl } from './workbench-editor.service';
@@ -57,6 +58,7 @@ export const EditorView = () => {
   const rightWidgetInfo = componentRegistry.getComponentRegistryInfo('editor-widget-right');
   const RightWidget: React.ComponentType<any> | undefined = rightWidgetInfo && rightWidgetInfo.views[0].component;
   const [ready, setReady] = React.useState<boolean>(workbenchEditorService.gridReady);
+  const styles_kt_workbench_editor = useDesignStyles(styles.kt_workbench_editor);
 
   React.useEffect(() => {
     if (!ready) {
@@ -77,7 +79,7 @@ export const EditorView = () => {
 
   return (
     <div
-      className={styles.kt_workbench_editor}
+      className={styles_kt_workbench_editor}
       id='workbench-editor'
       ref={(ele) => {
         ref.current = ele;
@@ -238,6 +240,7 @@ export const EditorGroupView = observer(({ group }: { group: EditorGroup }) => {
 
   const preferenceService = useInjectable(PreferenceService) as PreferenceService;
   const [isEmpty, setIsEmpty] = React.useState(group.resources.length === 0);
+  const styles_kt_editor_group = useDesignStyles(styles.kt_editor_group);
 
   const appConfig = useInjectable(AppConfig);
   const { editorBackgroundImage } = appConfig;
@@ -289,7 +292,7 @@ export const EditorGroupView = observer(({ group }: { group: EditorGroup }) => {
   return (
     <div
       ref={groupWrapperRef as any}
-      className={styles.kt_editor_group}
+      className={styles_kt_editor_group}
       tabIndex={1}
       onFocus={(e) => {
         group.gainFocus();
@@ -324,6 +327,7 @@ export const EditorGroupBody = observer(({ group }: { group: EditorGroup }) => {
   const editorBodyRef = React.useRef<HTMLDivElement>(null);
   const editorService = useInjectable(WorkbenchEditorService) as WorkbenchEditorServiceImpl;
   const eventBus = useInjectable(IEventBus) as IEventBus;
+  const styles_kt_editor_component = useDesignStyles(styles.kt_editor_component);
   const components: React.ReactNode[] = [];
   const codeEditorRef = React.useRef<HTMLDivElement>(null);
   const diffEditorRef = React.useRef<HTMLDivElement>(null);
@@ -450,7 +454,7 @@ export const EditorGroupBody = observer(({ group }: { group: EditorGroup }) => {
       <div className={styles.kt_editor_components}>
         <div
           className={cls({
-            [styles.kt_editor_component]: true,
+            [styles_kt_editor_component]: true,
             [styles.kt_hidden]: !group.currentOpenType || group.currentOpenType.type !== EditorOpenType.component,
           })}
         >
@@ -459,19 +463,19 @@ export const EditorGroupBody = observer(({ group }: { group: EditorGroup }) => {
         <div
           className={cls({
             [styles.kt_editor_code_editor]: true,
-            [styles.kt_editor_component]: true,
+            [styles_kt_editor_component]: true,
             [styles.kt_hidden]: !group.currentOpenType || group.currentOpenType.type !== EditorOpenType.code,
           })}
           ref={codeEditorRef}
         />
         <div
-          className={cls(styles.kt_editor_diff_editor, styles.kt_editor_component, {
+          className={cls(styles.kt_editor_diff_editor, styles_kt_editor_component, {
             [styles.kt_hidden]: !group.currentOpenType || group.currentOpenType.type !== EditorOpenType.diff,
           })}
           ref={diffEditorRef}
         />
         <div
-          className={cls(styles.kt_editor_diff_3_editor, styles.kt_editor_component, {
+          className={cls(styles.kt_editor_diff_3_editor, styles_kt_editor_component, {
             [styles.kt_hidden]: !group.currentOpenType || group.currentOpenType.type !== EditorOpenType.mergeEditor,
           })}
           ref={mergeEditorRef}

package/src/browser/feature.ts

@@ -1,9 +1,9 @@
-import { Injectable, Autowired } from '@opensumi/di';
-import { IDisposable, arrays, ILogger, Emitter, Event, URI } from '@opensumi/ide-core-browser';
+import { Autowired, Injectable } from '@opensumi/di';
+import { Emitter, Event, IDisposable, ILogger, URI, arrays } from '@opensumi/ide-core-browser';
 
 import { IEditor } from '../common';
 
-import { IEditorFeatureRegistry, IEditorFeatureContribution } from './types';
+import { IEditorFeatureContribution, IEditorFeatureRegistry } from './types';
 
 const { addElement } = arrays;
 

package/src/browser/format/format.service.ts

@@ -1,4 +1,4 @@
-import { Injector, Injectable, Autowired, INJECTOR_TOKEN } from '@opensumi/di';
+import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
 import { CancellationToken, ILogger } from '@opensumi/ide-core-common';
 import { languageFeaturesService } from '@opensumi/ide-monaco/lib/browser/monaco-api/languages';
 import { Range } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/range';
@@ -7,8 +7,8 @@ import {
   DocumentRangeFormattingEditProvider,
 } from '@opensumi/monaco-editor-core/esm/vs/editor/common/languages';
 import {
-  getRealAndSyntheticDocumentFormattersOrdered,
   FormattingMode,
+  getRealAndSyntheticDocumentFormattersOrdered,
 } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/format/browser/format';
 import { FormattingEdit } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/format/browser/formattingEdit';
 

package/src/browser/format/formatterSelect.ts

@@ -1,5 +1,5 @@
-import { Injectable, Autowired } from '@opensumi/di';
-import { QuickPickService, localize, PreferenceService, URI, PreferenceScope } from '@opensumi/ide-core-browser';
+import { Autowired, Injectable } from '@opensumi/di';
+import { PreferenceScope, PreferenceService, QuickPickService, URI, localize } from '@opensumi/ide-core-browser';
 import { ITextModel } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
 import { FormattingMode } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/format/browser/format';
 import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';

package/src/browser/fs-resource/fs-editor-doc.ts

@@ -1,20 +1,20 @@
-import { Injectable, Autowired } from '@opensumi/di';
+import { Autowired, Injectable } from '@opensumi/di';
 import {
   Emitter,
-  URI,
+  EncodingRegistry,
   Event,
-  IApplicationService,
   FileChangeType,
-  OperatingSystem,
+  IApplicationService,
   IEditorDocumentChange,
   IEditorDocumentModelSaveResult,
+  OperatingSystem,
   PreferenceService,
-  getLanguageIdFromMonaco,
-  EncodingRegistry,
-  UTF8_with_bom,
+  SaveTaskResponseState,
+  URI,
   UTF8,
+  UTF8_with_bom,
   detectEncodingFromBuffer,
-  SaveTaskResponseState,
+  getLanguageIdFromMonaco,
 } from '@opensumi/ide-core-browser';
 import { IFileServiceClient } from '@opensumi/ide-file-service';
 import { EOL } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';

package/src/browser/fs-resource/fs-resource.ts

@@ -1,21 +1,20 @@
 import { Autowired, Injectable } from '@opensumi/di';
 import {
+  IApplicationService,
+  LRUMap,
+  MessageType,
   OperatingSystem,
   URI,
   WithEventBus,
-  localize,
   formatLocalize,
-  MessageType,
-  LRUMap,
-  IApplicationService,
+  localize,
 } from '@opensumi/ide-core-browser';
 import { LabelService } from '@opensumi/ide-core-browser/lib/services';
 import { FileChangeType, path } from '@opensumi/ide-core-common';
-import { IFileServiceClient, FileStat } from '@opensumi/ide-file-service/lib/common';
+import { FileStat, IFileServiceClient } from '@opensumi/ide-file-service/lib/common';
 import { IDialogService } from '@opensumi/ide-overlay';
 
-import { IResourceProvider, IResource, ResourceNeedUpdateEvent, AskSaveResult } from '../../common';
-import { DIFF_SCHEME } from '../../common';
+import { AskSaveResult, DIFF_SCHEME, IResource, IResourceProvider, ResourceNeedUpdateEvent } from '../../common';
 import { IEditorDocumentModelService } from '../doc-model/types';
 
 import { FileTreeSet } from './file-tree-set';

package/src/browser/grid/grid.service.ts

@@ -1,7 +1,7 @@
-import { IDisposable, IEventBus, MaybeNull, Emitter } from '@opensumi/ide-core-browser';
+import { Emitter, IDisposable, IEventBus, MaybeNull } from '@opensumi/ide-core-browser';
 import { makeRandomHexString } from '@opensumi/ide-core-common';
 
-import { IEditorGroup, IEditorGroupState, Direction } from '../../common';
+import { Direction, IEditorGroup, IEditorGroupState } from '../../common';
 import { GridResizeEvent } from '../types';
 
 export const editorGridUid = new Set();

package/src/browser/history/index.ts

@@ -1,17 +1,17 @@
-import { Injectable, Autowired } from '@opensumi/di';
+import { Autowired, Injectable } from '@opensumi/di';
 import {
+  DisposableCollection,
+  EventType,
   IPosition,
-  URI,
-  WithEventBus,
   OnEvent,
   PreferenceService,
+  URI,
+  WithEventBus,
   addDisposableListener,
-  EventType,
-  DisposableCollection,
 } from '@opensumi/ide-core-browser';
 
 import { WorkbenchEditorService } from '../../common';
-import { EditorSelectionChangeEvent, EditorGroupChangeEvent, EditorGroupCloseEvent, EditorOpenType } from '../types';
+import { EditorGroupChangeEvent, EditorGroupCloseEvent, EditorOpenType, EditorSelectionChangeEvent } from '../types';
 
 const HistoryPositionLineThreshold = 7;
 const HardMaxStateLength = 200; // 超过200个过后，会缩减至100个, 防止反复缩减