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

package/lib/common/resource.d.ts

@@ -1,4 +1,4 @@
-import { URI, BasicEvent, MaybePromise, IDisposable, Event } from '@opensumi/ide-core-common';
+import { BasicEvent, Event, IDisposable, MaybePromise, URI } from '@opensumi/ide-core-common';
 export interface IResourceProvider {
     scheme?: string;
     /**

package/lib/common/resource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../../src/common/resource.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../../src/common/resource.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-editor",
-  "version": "2.27.3-rc-1708399099.0",
+  "version": "2.27.3-rc-1710489030.0",
   "files": [
     "lib",
     "src"
@@ -17,21 +17,21 @@
     "url": "git@github.com:opensumi/core.git"
   },
   "dependencies": {
-    "@opensumi/ide-core-common": "2.27.3-rc-1708399099.0",
-    "@opensumi/ide-core-node": "2.27.3-rc-1708399099.0",
-    "@opensumi/ide-file-service": "2.27.3-rc-1708399099.0",
-    "@opensumi/ide-monaco": "2.27.3-rc-1708399099.0",
-    "@opensumi/ide-utils": "2.27.3-rc-1708399099.0",
+    "@opensumi/ide-core-common": "2.27.3-rc-1710489030.0",
+    "@opensumi/ide-core-node": "2.27.3-rc-1710489030.0",
+    "@opensumi/ide-file-service": "2.27.3-rc-1710489030.0",
+    "@opensumi/ide-monaco": "2.27.3-rc-1710489030.0",
+    "@opensumi/ide-utils": "2.27.3-rc-1710489030.0",
     "vscode-oniguruma": "1.5.1"
   },
   "devDependencies": {
-    "@opensumi/ide-components": "2.27.3-rc-1708399099.0",
-    "@opensumi/ide-core-browser": "2.27.3-rc-1708399099.0",
+    "@opensumi/ide-components": "2.27.3-rc-1710489030.0",
+    "@opensumi/ide-core-browser": "2.27.3-rc-1710489030.0",
     "@opensumi/ide-dev-tool": "1.3.1",
-    "@opensumi/ide-overlay": "2.27.3-rc-1708399099.0",
-    "@opensumi/ide-quick-open": "2.27.3-rc-1708399099.0",
-    "@opensumi/ide-theme": "2.27.3-rc-1708399099.0",
-    "@opensumi/ide-workspace": "2.27.3-rc-1708399099.0"
+    "@opensumi/ide-overlay": "2.27.3-rc-1710489030.0",
+    "@opensumi/ide-quick-open": "2.27.3-rc-1710489030.0",
+    "@opensumi/ide-theme": "2.27.3-rc-1710489030.0",
+    "@opensumi/ide-workspace": "2.27.3-rc-1710489030.0"
   },
-  "gitHead": "4f7c1cb8da7cbdb691b5e56a5c5c4674af5ed7b6"
+  "gitHead": "8631990a482816fc26583e5811a87d083d93620b"
 }

package/src/browser/breadcrumb/default.ts

@@ -4,16 +4,16 @@ import { Autowired, Injectable } from '@opensumi/di';
 import {
   CommandService,
   EDITOR_COMMANDS,
-  Event,
   Emitter,
-  getSymbolIcon,
+  Event,
   IPosition,
   IRange,
+  LRUMap,
   MaybeNull,
   OnEvent,
   URI,
   WithEventBus,
-  LRUMap,
+  getSymbolIcon,
   path,
 } from '@opensumi/ide-core-browser';
 import { LabelService } from '@opensumi/ide-core-browser/lib/services';

package/src/browser/breadcrumb/document-symbol.ts

@@ -1,21 +1,21 @@
 import debounce from 'lodash/debounce';
 
-import { Injectable, Autowired } from '@opensumi/di';
+import { Autowired, Injectable } from '@opensumi/di';
 import {
-  WithEventBus,
-  MaybeNull,
-  OnEvent,
   BasicEvent,
-  URI,
+  CancellationToken,
   CancellationTokenSource,
   Deferred,
-  CancellationToken,
+  MaybeNull,
+  OnEvent,
+  URI,
+  WithEventBus,
 } from '@opensumi/ide-core-browser';
 import { languageFeaturesService } from '@opensumi/ide-monaco/lib/browser/monaco-api/languages';
 import { DocumentSymbol, SymbolTag } from '@opensumi/monaco-editor-core/esm/vs/editor/common/languages';
 
 import { WorkbenchEditorService } from '../../common';
-import { IEditorDocumentModelService, EditorDocumentModelContentChangedEvent } from '../doc-model/types';
+import { EditorDocumentModelContentChangedEvent, IEditorDocumentModelService } from '../doc-model/types';
 
 @Injectable()
 export class DocumentSymbolStore extends WithEventBus {

package/src/browser/breadcrumb/index.ts

@@ -1,8 +1,8 @@
-import { Injectable, Autowired } from '@opensumi/di';
-import { IDisposable, URI, arrays, MaybeNull, Emitter } from '@opensumi/ide-core-browser';
+import { Autowired, Injectable } from '@opensumi/di';
+import { Emitter, IDisposable, MaybeNull, URI, arrays } from '@opensumi/ide-core-browser';
 
 import { IEditor } from '../../common';
-import { IBreadCrumbService, IBreadCrumbPart, IBreadCrumbProvider } from '../types';
+import { IBreadCrumbPart, IBreadCrumbProvider, IBreadCrumbService } from '../types';
 
 import { DefaultBreadCrumbProvider } from './default';
 

package/src/browser/component.ts

@@ -2,19 +2,19 @@ import isEqual from 'lodash/isEqual';
 import uniqWith from 'lodash/uniqWith';
 import ReactDOM from 'react-dom';
 
-import { Injectable, Autowired } from '@opensumi/di';
+import { Autowired, Injectable } from '@opensumi/di';
 import { ExtensionActivateEvent, IDisposable, IEventBus } from '@opensumi/ide-core-common';
 
-import { IResource, IEditorOpenType } from '../common';
+import { IEditorOpenType, IResource } from '../common';
 
 import {
+  EditorComponentDisposeEvent,
   EditorComponentRegistry,
+  EditorComponentRenderMode,
+  EditorSide,
   IEditorComponent,
   IEditorComponentResolver,
-  EditorComponentRenderMode,
   IEditorSideWidget,
-  EditorSide,
-  EditorComponentDisposeEvent,
   RegisterEditorComponentEvent,
   RegisterEditorSideComponentEvent,
 } from './types';

package/src/browser/decoration-applier.ts

@@ -1,22 +1,23 @@
 import cls from 'classnames';
 
 import { Autowired, Injectable } from '@opensumi/di';
-import { Disposable, URI, IEventBus, IMarkdownString } from '@opensumi/ide-core-common';
-import type { ICodeEditor as IMonacoCodeEditor } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
+import { Disposable, IEventBus, IMarkdownString, URI } from '@opensumi/ide-core-common';
 import { IThemeService } from '@opensumi/ide-theme';
 import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
 
-import { IDecorationRenderOptions, IDecorationApplyOptions } from '../common';
+import { IDecorationApplyOptions, IDecorationRenderOptions } from '../common';
 
 import {
-  IEditorDecorationCollectionService,
-  IDynamicModelDecorationProperty,
-  IThemedCssStyle,
+  DidApplyEditorDecorationFromProvider,
   EditorDecorationChangeEvent,
   EditorDecorationTypeRemovedEvent,
-  DidApplyEditorDecorationFromProvider,
+  IDynamicModelDecorationProperty,
+  IEditorDecorationCollectionService,
+  IThemedCssStyle,
 } from './types';
 
+import type { ICodeEditor as IMonacoCodeEditor } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
+
 @Injectable({ multiple: true })
 export class MonacoEditorDecorationApplier extends Disposable {
   @Autowired(IEditorDecorationCollectionService)

package/src/browser/diff/compare.ts

@@ -1,18 +1,18 @@
-import { Injectable, Autowired } from '@opensumi/di';
+import { Autowired, Injectable } from '@opensumi/di';
 import {
-  URI,
-  Domain,
-  localize,
-  Deferred,
-  CommandService,
-  EDITOR_COMMANDS,
   CommandContribution,
   CommandRegistry,
+  CommandService,
+  Deferred,
+  Domain,
+  EDITOR_COMMANDS,
+  URI,
+  getIcon,
+  localize,
 } from '@opensumi/ide-core-browser';
-import { getIcon } from '@opensumi/ide-core-browser';
-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 { ICompareService, CompareResult } from '../types';
+import { CompareResult, ICompareService } from '../types';
 
 @Injectable()
 export class CompareService implements ICompareService {

package/src/browser/diff/index.ts

@@ -1,9 +1,9 @@
-import { Injectable, Autowired } from '@opensumi/di';
-import { URI, Domain, WithEventBus, OnEvent } from '@opensumi/ide-core-browser';
+import { Autowired, Injectable } from '@opensumi/di';
+import { Domain, OnEvent, URI, WithEventBus } from '@opensumi/ide-core-browser';
 import { LabelService } from '@opensumi/ide-core-browser/lib/services';
 import { IFileServiceClient } from '@opensumi/ide-file-service';
 
-import { IResourceProvider, IDiffResource, ResourceService, ResourceDecorationChangeEvent } from '../../common';
+import { IDiffResource, IResourceProvider, ResourceDecorationChangeEvent, ResourceService } from '../../common';
 import { BrowserEditorContribution, EditorComponentRegistry, EditorOpenType } from '../types';
 
 // diff URI:
@@ -75,15 +75,15 @@ export class DiffResourceProvider extends WithEventBus implements IResourceProvi
       // 默认显示 modified 文件路径
       this.getReadableTooltip(modifiedUri),
     ]).then(([icon, title]) => ({
-        name,
-        icon,
-        uri,
-        metadata: {
-          original: originalUri,
-          modified: modifiedUri,
-        },
-        title,
-      }));
+      name,
+      icon,
+      uri,
+      metadata: {
+        original: originalUri,
+        modified: modifiedUri,
+      },
+      title,
+    }));
   }
 
   async shouldCloseResource(resource, openedResources): Promise<boolean> {

package/src/browser/doc-cache/local-storage-cache.ts

@@ -1,8 +1,8 @@
-import { Injectable, Autowired } from '@opensumi/di';
+import { Autowired, Injectable } from '@opensumi/di';
 import { URI } from '@opensumi/ide-core-common';
 import { IWorkspaceStorageService } from '@opensumi/ide-workspace';
 
-import { IDocPersistentCacheProvider, IDocStatus, IDocCache, parseCacheValueFrom } from '../../common/doc-cache';
+import { IDocCache, IDocPersistentCacheProvider, IDocStatus, parseCacheValueFrom } from '../../common/doc-cache';
 
 /**
  * 使用 LocalStorage 实现的文档缓存对象

package/src/browser/doc-model/editor-document-model-service.ts

@@ -1,32 +1,33 @@
-import { Injectable, Autowired, INJECTOR_TOKEN, Injector } from '@opensumi/di';
+import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
 import {
-  URI,
-  IRef,
-  ReferenceManager,
   IEditorDocumentChange,
   IEditorDocumentModelSaveResult,
-  WithEventBus,
-  OnEvent,
-  StorageProvider,
-  IStorage,
-  STORAGE_SCHEMA,
   ILogger,
+  IRef,
+  IStorage,
+  OnEvent,
   PreferenceService,
   ReadyEvent,
-  memoize,
+  ReferenceManager,
+  STORAGE_SCHEMA,
+  StorageProvider,
+  URI,
+  WithEventBus,
   mapToSerializable,
+  memoize,
   serializableToMap,
 } from '@opensumi/ide-core-browser';
 import { IHashCalculateService } from '@opensumi/ide-core-common/lib/hash-calculate/hash-calculate';
 import { EOL } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
 
+import { IEditorDocumentModel } from '../../common/editor';
+
 import { EditorDocumentModel } from './editor-document-model';
 import {
-  IEditorDocumentModel,
+  EditorDocumentModelCreationEvent,
+  EditorDocumentModelOptionExternalUpdatedEvent,
   IEditorDocumentModelContentRegistry,
   IEditorDocumentModelService,
-  EditorDocumentModelOptionExternalUpdatedEvent,
-  EditorDocumentModelCreationEvent,
   IPreferredModelOptions,
 } from './types';
 

package/src/browser/doc-model/editor-document-model.ts

@@ -5,23 +5,23 @@ import {
   CommandService,
   Disposable,
   Emitter,
-  formatLocalize,
   IEventBus,
   ILogger,
   IRange,
   IReporterService,
-  isThenable,
-  isUndefinedOrNull,
-  localize,
   PreferenceService,
   REPORT_NAME,
   SaveTaskErrorCause,
   SaveTaskResponseState,
   Throttler,
   URI,
+  formatLocalize,
+  isThenable,
+  isUndefinedOrNull,
+  localize,
 } from '@opensumi/ide-core-browser';
 import { IHashCalculateService } from '@opensumi/ide-core-common/lib/hash-calculate/hash-calculate';
-import { monaco, URI as MonacoURI } from '@opensumi/ide-monaco/lib/browser/monaco-api';
+import { URI as MonacoURI, monaco } from '@opensumi/ide-monaco/lib/browser/monaco-api';
 import { EOL, EndOfLineSequence, ITextModel } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
 import { IMessageService } from '@opensumi/ide-overlay';
 import {
@@ -30,20 +30,21 @@ import {
 } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/editOperation';
 import { Range } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/range';
 import {
-  ITextBuffer,
-  EndOfLinePreference,
   DefaultEndOfLine,
+  EndOfLinePreference,
+  ITextBuffer,
 } from '@opensumi/monaco-editor-core/esm/vs/editor/common/model';
 import { createTextBuffer } from '@opensumi/monaco-editor-core/esm/vs/editor/common/model/textModel';
 
 import {
   IDocCache,
   IDocPersistentCacheProvider,
+  IEditorDocumentModelContentChange,
+  SaveReason,
   isDocContentCache,
   parseRangeFrom,
-  SaveReason,
-  IEditorDocumentModelContentChange,
 } from '../../common';
+import { IEditorDocumentModel } from '../../common/editor';
 import { EditorPreferences } from '../preference/schema';
 import { createEditorPreferenceProxy } from '../preference/util';
 import { CompareResult, ICompareService } from '../types';
@@ -55,12 +56,11 @@ import {
   EditorDocumentModelOptionChangedEvent,
   EditorDocumentModelRemovalEvent,
   EditorDocumentModelSavedEvent,
-  IEditorDocumentModel,
+  EditorDocumentModelWillSaveEvent,
+  IDocModelUpdateOptions,
   IEditorDocumentModelContentRegistry,
   IEditorDocumentModelService,
   ORIGINAL_DOC_SCHEME,
-  EditorDocumentModelWillSaveEvent,
-  IDocModelUpdateOptions,
 } from './types';
 
 export interface EditorDocumentModelConstructionOptions {

package/src/browser/doc-model/editor-document-registry.ts

@@ -1,10 +1,10 @@
-import { Injectable, Autowired } from '@opensumi/di';
-import { URI, IDisposable, IEventBus, Emitter, LRUMap } from '@opensumi/ide-core-browser';
+import { Autowired, Injectable } from '@opensumi/di';
+import { Emitter, IDisposable, IEventBus, LRUMap, URI } from '@opensumi/ide-core-browser';
 
 import {
-  IEditorDocumentModelContentRegistry,
-  IEditorDocumentModelContentProvider,
   EditorDocumentModelOptionExternalUpdatedEvent,
+  IEditorDocumentModelContentProvider,
+  IEditorDocumentModelContentRegistry,
   ORIGINAL_DOC_SCHEME,
 } from './types';
 

package/src/browser/doc-model/editor-is-fn.ts

@@ -1,4 +1,4 @@
-import { IStackElement, IEditStackElement, IEOLStackElement } from './types';
+import { IEOLStackElement, IEditStackElement, IStackElement } from './types';
 
 export function isEditStack(element: IStackElement): element is IEditStackElement {
   return !!(element as IEditStackElement).editOperations;

package/src/browser/doc-model/override.ts

@@ -2,8 +2,8 @@
 import { Autowired, Injectable } from '@opensumi/di';
 import { URI } from '@opensumi/ide-core-browser';
 import {
-  ITextModelService,
   ITextModelContentProvider,
+  ITextModelService,
 } from '@opensumi/monaco-editor-core/esm/vs/editor/common/services/resolverService';
 import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
 

package/src/browser/doc-model/save-task.ts

@@ -1,13 +1,13 @@
 import {
-  URI,
+  CancellationToken,
+  CancellationTokenSource,
   Deferred,
+  Disposable,
   IEditorDocumentChange,
   IEditorDocumentModelSaveResult,
-  CancellationTokenSource,
-  Disposable,
-  CancellationToken,
-  SaveTaskResponseState,
   SaveTaskErrorCause,
+  SaveTaskResponseState,
+  URI,
 } from '@opensumi/ide-core-browser';
 import { EOL } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
 

package/src/browser/doc-model/saveParticipants.ts

@@ -1,17 +1,17 @@
-import { Injectable, Autowired, Injector, INJECTOR_TOKEN } from '@opensumi/di';
+import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
 import {
   ClientAppContribution,
-  WithEventBus,
-  Domain,
-  OnEvent,
-  PreferenceService,
   CommandService,
-  ServiceNames,
+  Domain,
   ILogger,
-  MonacoOverrideServiceRegistry,
   IProgress,
-  ProgressLocation,
   IProgressStep,
+  MonacoOverrideServiceRegistry,
+  OnEvent,
+  PreferenceService,
+  ProgressLocation,
+  ServiceNames,
+  WithEventBus,
   formatLocalize,
 } from '@opensumi/ide-core-browser';
 import { IProgressService } from '@opensumi/ide-core-browser/lib/progress';
@@ -25,14 +25,12 @@ import { EditOperation } from '@opensumi/monaco-editor-core/esm/vs/editor/common
 import { Range } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/range';
 import * as languages from '@opensumi/monaco-editor-core/esm/vs/editor/common/languages';
 import { CodeActionProvider } from '@opensumi/monaco-editor-core/esm/vs/editor/common/languages';
+import { getCodeActions } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/codeAction/browser/codeAction';
 import {
-  getCodeActions,
   CodeActionItem,
-} from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/codeAction/browser/codeAction';
-import {
   CodeActionKind,
   CodeActionTriggerSource,
-} from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/codeAction/browser/types';
+} from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/codeAction/common/types';
 import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
 
 import { MonacoCodeService } from '../editor.override';

package/src/browser/doc-model/types.ts

@@ -1,112 +1,18 @@
 import {
-  URI,
-  MaybePromise,
-  IRef,
-  IDisposable,
-  Event,
-  IRange,
   BasicEvent,
+  Event,
+  IDisposable,
   IEditOperation,
   IEditorDocumentChange,
   IEditorDocumentModelSaveResult,
+  MaybePromise,
+  URI,
 } from '@opensumi/ide-core-browser';
-import { EndOfLineSequence, EOL, ITextModel } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
+import { EOL, EndOfLineSequence } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
 import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
 
 import { IEditorDocumentModelContentChange, SaveReason } from '../../common';
-
-/**
- * editorDocumentModel is a wrapped concept for monaco's textModel
- */
-export interface IEditorDocumentModel extends IDisposable {
-  /**
-   * 文档URI
-   */
-  readonly uri: URI;
-
-  /**
-   * A unique identifier associated with this model.
-   */
-  id: string;
-
-  /**
-   * 编码
-   */
-  encoding: string;
-
-  /**
-   * An event emitted when the model's encoding have changed.
-   * @event
-   */
-  onDidChangeEncoding: Event<void>;
-
-  /**
-   * 行末结束
-   */
-  eol: EOL;
-
-  /**
-   * 语言Id
-   */
-  languageId: string;
-
-  /**
-   * 是否被修改过
-   */
-  readonly dirty: boolean;
-
-  /**
-   * 能否修改
-   */
-  readonly readonly: boolean;
-
-  /**
-   * 能否保存
-   */
-  readonly savable: boolean;
-
-  /**
-   * 是否永远都显示 dirty
-   */
-  readonly alwaysDirty: boolean;
-
-  /**
-   * 即便是 dirty 也要被 dispose
-   */
-  readonly disposeEvenDirty: boolean;
-
-  /**
-   * 是否关闭自动保存功能
-   */
-  readonly closeAutoSave: boolean;
-
-  /**
-   * 获得monaco的TextModel
-   */
-  getMonacoModel(): ITextModel;
-
-  /**
-   *  保存文档, 如果文档不可保存，则不会有任何反应
-   *  @param force 强制保存, 不管diff
-   */
-  save(force?: boolean, reason?: SaveReason): Promise<boolean>;
-
-  /**
-   * 恢复文件内容
-   * @param notOnDisk 文档已经不存在磁盘
-   */
-  revert(notOnDisk?: boolean): Promise<void>;
-
-  getText(range?: IRange): string;
-
-  updateContent(content: string, eol?: EOL): void;
-
-  updateEncoding(encoding: string): Promise<void>;
-
-  // setEncoding(encoding: string, preferredEncoding, mode: EncodingMode): Promise<void>;
-
-  updateOptions(options: IDocModelUpdateOptions);
-}
+import { IEditorDocumentModel, IEditorDocumentModelRef } from '../../common/editor';
 
 export interface IDocModelUpdateOptions extends monaco.editor.ITextModelUpdateOptions {
   detectIndentation?: boolean;
@@ -212,8 +118,6 @@ export interface IPreferredModelOptions {
   eol?: EOL;
 }
 
-export type IEditorDocumentModelRef = IRef<IEditorDocumentModel>;
-
 export interface IEditorDocumentModelService {
   hasLanguage(languageId: string): boolean;