@opensumi/ide-editor 3.2.5-next-1724407522.0 → 3.2.5-next-1724407842.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-editor",
-  "version": "3.2.5-next-1724407522.0",
+  "version": "3.2.5-next-1724407842.0",
   "files": [
     "lib",
     "src"
@@ -17,21 +17,21 @@
     "url": "git@github.com:opensumi/core.git"
   },
   "dependencies": {
-    "@opensumi/ide-core-common": "3.2.5-next-1724407522.0",
-    "@opensumi/ide-core-node": "3.2.5-next-1724407522.0",
-    "@opensumi/ide-file-service": "3.2.5-next-1724407522.0",
-    "@opensumi/ide-monaco": "3.2.5-next-1724407522.0",
-    "@opensumi/ide-utils": "3.2.5-next-1724407522.0",
+    "@opensumi/ide-core-common": "3.2.5-next-1724407842.0",
+    "@opensumi/ide-core-node": "3.2.5-next-1724407842.0",
+    "@opensumi/ide-file-service": "3.2.5-next-1724407842.0",
+    "@opensumi/ide-monaco": "3.2.5-next-1724407842.0",
+    "@opensumi/ide-utils": "3.2.5-next-1724407842.0",
     "vscode-oniguruma": "1.5.1"
   },
   "devDependencies": {
-    "@opensumi/ide-components": "3.2.5-next-1724407522.0",
-    "@opensumi/ide-core-browser": "3.2.5-next-1724407522.0",
-    "@opensumi/ide-dev-tool": "3.2.5-next-1724407522.0",
-    "@opensumi/ide-overlay": "3.2.5-next-1724407522.0",
-    "@opensumi/ide-quick-open": "3.2.5-next-1724407522.0",
-    "@opensumi/ide-theme": "3.2.5-next-1724407522.0",
-    "@opensumi/ide-workspace": "3.2.5-next-1724407522.0"
+    "@opensumi/ide-components": "3.2.5-next-1724407842.0",
+    "@opensumi/ide-core-browser": "3.2.5-next-1724407842.0",
+    "@opensumi/ide-dev-tool": "3.2.5-next-1724407842.0",
+    "@opensumi/ide-overlay": "3.2.5-next-1724407842.0",
+    "@opensumi/ide-quick-open": "3.2.5-next-1724407842.0",
+    "@opensumi/ide-theme": "3.2.5-next-1724407842.0",
+    "@opensumi/ide-workspace": "3.2.5-next-1724407842.0"
   },
-  "gitHead": "8cc47746874b1638043507b3b60b8f0d776dd210"
+  "gitHead": "7ed3e7872ef82de42d9523f55c5eb83b5aa0f581"
 }

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

@@ -23,7 +23,7 @@ import { IHashCalculateService } from '@opensumi/ide-core-common/lib/hash-calcul
 import { IFileServiceClient } from '@opensumi/ide-file-service';
 import { EOL } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
 
-import { IEditorDocumentModel } from '../../common/editor';
+import { IEditorDocumentDescription, IEditorDocumentModel } from '../../common/editor';
 
 import { EditorDocumentModel } from './editor-document-model';
 import {
@@ -230,6 +230,30 @@ export class EditorDocumentModelServiceImpl extends WithEventBus implements IEdi
     return this._modelReferenceManager.getReferenceIfHasInstance(uri.toString(), reason);
   }
 
+  getModelDescription(uri: URI, reason?: string): IEditorDocumentDescription | null {
+    const ref = this.getModelReference(uri, reason);
+    if (!ref) {
+      return null;
+    }
+
+    const instance = ref.instance;
+    const resullt = {
+      alwaysDirty: instance.alwaysDirty,
+      closeAutoSave: instance.closeAutoSave,
+      disposeEvenDirty: instance.disposeEvenDirty,
+      eol: instance.eol,
+      encoding: instance.encoding,
+      dirty: instance.dirty,
+      languageId: instance.languageId,
+      readonly: instance.readonly,
+      uri: instance.uri,
+      id: instance.id,
+      savable: instance.savable,
+    };
+    ref.dispose();
+    return resullt;
+  }
+
   getAllModels(): IEditorDocumentModel[] {
     return Array.from(this.editorDocModels.values());
   }

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

@@ -360,7 +360,25 @@ export class EditorDocumentModel extends Disposable implements IEditorDocumentMo
     return this.monacoModel;
   }
 
+  async syncDocumentModelToExtThread() {
+    await this.eventBus.fireAndAwait(
+      new EditorDocumentModelOptionChangedEvent({
+        uri: this.uri,
+        languageId: this.languageId,
+        encoding: this.encoding,
+        eol: this.eol,
+        dirty: this.dirty,
+      }),
+    );
+  }
+
   async save(force = false, reason: SaveReason = SaveReason.Manual): Promise<boolean> {
+    if (!this.dirty) {
+      // 如果文档内容没有变化，则只同步新状态到插件进程
+      await this.syncDocumentModelToExtThread();
+      return false;
+    }
+
     const provider = await this.contentRegistry.getProvider(this.uri);
     const isReadonly = await provider?.isReadonly(this.uri);
 

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

@@ -283,6 +283,7 @@ export class TrimFinalNewLinesParticipant extends WithEventBus {
 
       const model = modelRef.instance.getMonacoModel();
       this.doTrimFinalNewLines(model, e.payload.reason !== SaveReason.Manual);
+      modelRef.dispose();
     }
   }
 

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

@@ -12,7 +12,7 @@ import * as monaco from '@opensumi/ide-monaco';
 import { EOL, EndOfLineSequence } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
 
 import { IEditorDocumentModelContentChange, SaveReason } from '../../common';
-import { IEditorDocumentModel, IEditorDocumentModelRef } from '../../common/editor';
+import { IEditorDocumentDescription, IEditorDocumentModel, IEditorDocumentModelRef } from '../../common/editor';
 
 export interface IDocModelUpdateOptions extends monaco.editor.ITextModelUpdateOptions {
   detectIndentation?: boolean;
@@ -130,6 +130,7 @@ export interface IEditorDocumentModelService {
    * 当文档从来没有被打开过时，返回null
    */
   getModelReference(uri: URI, reason?: string): IEditorDocumentModelRef | null;
+  getModelDescription(uri: URI, reason?: string): IEditorDocumentDescription | null;
 
   /**
    * 获得全部model
@@ -193,6 +194,7 @@ export interface IEditorDocumentModelOptionChangedEventPayload {
   encoding?: string;
   languageId?: string;
   eol?: EOL;
+  dirty?: boolean;
 }
 
 export class EditorDocumentModelCreationEvent extends BasicEvent<IEditorDocumentModelCreationEventPayload> {}

package/src/browser/editor.contribution.ts

@@ -808,7 +808,12 @@ export class EditorContribution
           return;
         }
 
-        return this.editorDocumentModelService.getModelReference(uri)?.instance.encoding;
+        const ref = this.editorDocumentModelService.getModelDescription(uri);
+        if (!ref) {
+          return;
+        }
+
+        return ref.encoding;
       },
     });
 
@@ -832,8 +837,8 @@ export class EditorContribution
 
         const provider = await this.contentRegistry.getProvider(uri);
         const guessedEncoding = await provider?.guessEncoding?.(uri);
-        const ref = this.editorDocumentModelService.getModelReference(uri);
-        const currentEncoding = documentModel?.encoding ?? ref?.instance.encoding;
+        const ref = this.editorDocumentModelService.getModelDescription(uri);
+        const currentEncoding = documentModel?.encoding ?? ref?.encoding;
 
         let matchIndex: number | undefined;
         const encodingItems: QuickPickItem<string>[] = Object.keys(SUPPORTED_ENCODINGS)

package/src/browser/format/formatter-selector.ts

@@ -47,12 +47,11 @@ export class FormattingSelector implements IFormattingSelector {
     mode: FormattingMode,
     _kind: FormattingKind,
   ): Promise<T | undefined> {
-    const docRef = this.modelService.getModelReference(URI.from(document.uri.toJSON()));
-    if (!docRef) {
+    const docDesc = this.modelService.getModelDescription(URI.from(document.uri.toJSON()));
+    if (!docDesc) {
       return;
     }
-    const languageId = docRef.instance.languageId;
-    docRef.dispose();
+    const languageId = docDesc.languageId;
     const preferred = this.getPreferedFormatter(languageId);
 
     const elements: { [key: string]: T } = {};
@@ -120,12 +119,11 @@ export class FormattingSelector implements IFormattingSelector {
     formatters: T[],
     document: ITextModel,
   ): Promise<T | undefined> {
-    const docRef = this.modelService.getModelReference(URI.from(document.uri.toJSON()));
-    if (!docRef) {
+    const docDesc = this.modelService.getModelDescription(URI.from(document.uri.toJSON()));
+    if (!docDesc) {
       return;
     }
-    const languageId = docRef.instance.languageId;
-    docRef.dispose();
+    const languageId = docDesc.languageId;
 
     const elements: { [key: string]: T } = {};
     formatters.forEach((provider: T) => {

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

@@ -181,8 +181,8 @@ export class FileSystemResourceProvider extends WithEventBus implements IResourc
     this.cachedFileStat.delete(resource.uri.toString());
   }
   async shouldCloseResourceWithoutConfirm(resource: IResource) {
-    const documentModelRef = this.documentModelService.getModelReference(resource.uri, 'close-resource-check');
-    if (documentModelRef && documentModelRef.instance.dirty) {
+    const documentModelRef = this.documentModelService.getModelDescription(resource.uri, 'close-resource-check');
+    if (documentModelRef && documentModelRef.dirty) {
       return true;
     }
     return false;
@@ -204,6 +204,7 @@ export class FileSystemResourceProvider extends WithEventBus implements IResourc
       documentModelRef.dispose();
       return false;
     } else {
+      documentModelRef.dispose();
       return true;
     }
   }
@@ -222,11 +223,8 @@ export class FileSystemResourceProvider extends WithEventBus implements IResourc
         }
       }
     }
-    const documentModelRef = this.documentModelService.getModelReference(resource.uri, 'close-resource-check');
-    if (!documentModelRef || !documentModelRef.instance.dirty) {
-      if (documentModelRef) {
-        documentModelRef.dispose();
-      }
+    const documentModelRef = this.documentModelService.getModelDescription(resource.uri, 'close-resource-check');
+    if (!documentModelRef || !documentModelRef.dirty) {
       return true;
     }
 

package/src/browser/hooks/useEditor.ts

@@ -1,34 +1,35 @@
 import { useEffect, useState } from 'react';
 
-import { URI, useInjectable } from '@opensumi/ide-core-browser';
+import { DisposableStore, URI, useInjectable } from '@opensumi/ide-core-browser';
 
 import { IEditorDocumentModelService } from '../doc-model/types';
-import { IEditorDocumentModelRef } from '../types';
+import { IEditorDocumentModel } from '../types';
 
-export function useEditorDocumentModelRef(uri: URI) {
+export function useEditorDocumentModel(uri: URI) {
   const documentService: IEditorDocumentModelService = useInjectable(IEditorDocumentModelService);
-  const [ref, setRef] = useState<IEditorDocumentModelRef | null>(null);
+  const [instance, setInstance] = useState<IEditorDocumentModel | null>(null);
 
   useEffect(() => {
+    const toDispose = new DisposableStore();
     const run = () => {
       const ref = documentService.getModelReference(uri);
       if (ref) {
-        setRef(ref);
+        setInstance(ref.instance);
+        ref.dispose();
       }
     };
 
-    const toDispose = documentService.onDocumentModelCreated(uri.toString(), () => {
-      run();
-    });
+    toDispose.add(
+      documentService.onDocumentModelCreated(uri.toString(), () => {
+        run();
+      }),
+    );
 
     run();
     return () => {
       toDispose.dispose();
-      if (ref) {
-        ref.dispose();
-      }
     };
   }, [uri]);
 
-  return ref;
+  return instance;
 }

package/src/browser/merge-conflict/merge-conflict.model.ts

@@ -4,12 +4,12 @@ import { useEffect, useMemo, useState } from 'react';
 import { formatLocalize, useInjectable } from '@opensumi/ide-core-browser';
 import { DisposableStore, URI } from '@opensumi/ide-utils';
 
-import { useEditorDocumentModelRef } from '../hooks/useEditor';
+import { useEditorDocumentModel } from '../hooks/useEditor';
 
 import { MergeConflictService } from './merge-conflict.service';
 
 export function useMergeConflictModel(uri: URI) {
-  const editorModel = useEditorDocumentModelRef(uri);
+  const editorModel = useEditorDocumentModel(uri);
 
   /**
    * 如果是原来就有冲突的文件，当冲突没了之后，仍然显示冲突
@@ -28,9 +28,8 @@ export function useMergeConflictModel(uri: URI) {
     const disposables = new DisposableStore();
 
     if (editorModel) {
-      const { instance } = editorModel;
       const run = () => {
-        const n = mergeConflictService.scanDocument(instance.getMonacoModel());
+        const n = mergeConflictService.scanDocument(editorModel.getMonacoModel());
         setConflictsCount(n);
         if (n > 0) {
           setIsInitialVisiable(true);
@@ -40,7 +39,7 @@ export function useMergeConflictModel(uri: URI) {
       const debounceRun = debounce(run, 150);
 
       disposables.add(
-        instance.getMonacoModel().onDidChangeContent(() => {
+        editorModel.getMonacoModel().onDidChangeContent(() => {
           debounceRun();
         }),
       );

package/src/browser/monaco-contrib/callHierarchy/callHierarchy.service.ts

@@ -112,8 +112,10 @@ export class CallHierarchyService implements ICallHierarchyService {
   }
 
   async prepareCallHierarchyProvider(resource: Uri, position: Position) {
-    let textModel = this.modelService.getModelReference(URI.parse(resource.toString()))?.instance.getMonacoModel();
-    let textModelReference: IDisposable | undefined;
+    let textModelReference = this.modelService.getModelReference(URI.parse(resource.toString()));
+    let textModel: ITextModel | undefined = textModelReference?.instance.getMonacoModel();
+    textModelReference?.dispose();
+
     if (!textModel) {
       const result = await this.modelService.createModelReference(URI.parse(resource.toString()));
       textModel = result.instance.getMonacoModel();

package/src/browser/monaco-contrib/typeHierarchy/typeHierarchy.service.ts

@@ -104,8 +104,11 @@ export class TypeHierarchyService implements ITypeHierarchyService {
   }
 
   async prepareTypeHierarchyProvider(resource: Uri, position: Position) {
-    let textModel = this.modelService.getModelReference(URI.parse(resource.toString()))?.instance.getMonacoModel();
-    let textModelReference: IDisposable | undefined;
+    let textModelReference = this.modelService.getModelReference(URI.parse(resource.toString()));
+
+    let textModel: ITextModel | undefined = textModelReference?.instance.getMonacoModel();
+    textModelReference?.dispose();
+
     if (!textModel) {
       const result = await this.modelService.createModelReference(URI.parse(resource.toString()));
       textModel = result.instance.getMonacoModel();

package/src/browser/untitled-resource.ts

@@ -171,8 +171,8 @@ export class UntitledSchemeResourceProvider extends WithEventBus implements IRes
   }
 
   async shouldCloseResourceWithoutConfirm(resource: IResource) {
-    const documentModelRef = this.documentModelService.getModelReference(resource.uri, 'close-resource-check');
-    if (documentModelRef && documentModelRef.instance.dirty) {
+    const documentModelRef = this.documentModelService.getModelDescription(resource.uri, 'close-resource-check');
+    if (documentModelRef && documentModelRef.dirty) {
       return true;
     }
     return false;
@@ -195,16 +195,14 @@ export class UntitledSchemeResourceProvider extends WithEventBus implements IRes
       documentModelRef.dispose();
       return false;
     } else {
+      documentModelRef.dispose();
       return true;
     }
   }
 
   async shouldCloseResource(resource: IResource) {
-    const documentModelRef = this.documentModelService.getModelReference(resource.uri, 'close-resource-check');
-    if (!documentModelRef || !documentModelRef.instance.dirty) {
-      if (documentModelRef) {
-        documentModelRef.dispose();
-      }
+    const documentModelRef = this.documentModelService.getModelDescription(resource.uri, 'close-resource-check');
+    if (!documentModelRef || !documentModelRef.dirty) {
       return true;
     }
     // 询问用户是否保存

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

@@ -44,6 +44,7 @@ import {
   debounce,
   formatLocalize,
   getDebugLogger,
+  isDefined,
   isUndefinedOrNull,
   localize,
   makeRandomHexString,
@@ -435,10 +436,9 @@ export class WorkbenchEditorServiceImpl extends WithEventBus implements Workbenc
     // contextKeys
     const getLanguageFromModel = (uri: URI) => {
       let result: string | null = null;
-      const modelRef = this.documentModelManager.getModelReference(uri, 'resourceContextKey');
+      const modelRef = this.documentModelManager.getModelDescription(uri, 'resourceContextKey');
       if (modelRef) {
-        result = modelRef.instance.languageId;
-        modelRef.dispose();
+        result = modelRef.languageId;
       }
       return result;
     };
@@ -717,12 +717,10 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
   /**
    * 当前打开的所有resource
    */
-  // @observable.shallow
   resources: IResource[] = [];
 
   resourceStatus: Map<IResource, Promise<void>> = new Map();
 
-  // @observable.ref
   _currentResource: IResource | null;
 
   _currentOpenType: IEditorOpenType | null;
@@ -894,12 +892,9 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
     if (!this._resourceContext) {
       const getLanguageFromModel = (uri: URI) => {
         let result: string | null = null;
-        const modelRef = this.documentModelManager.getModelReference(uri, 'resourceContextKey');
+        const modelRef = this.documentModelManager.getModelDescription(uri, 'resourceContextKey');
         if (modelRef) {
-          if (modelRef) {
-            result = modelRef.instance.languageId;
-          }
-          modelRef.dispose();
+          result = modelRef.languageId;
         }
         return result;
       };
@@ -1414,6 +1409,9 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
           if (options && options.label) {
             resource.name = options.label;
           }
+          if (options && isDefined(options.supportsRevive)) {
+            resource.supportsRevive = options.supportsRevive;
+          }
           let replaceResource: IResource | null = null;
           if (options && options.index !== undefined && options.index < this.resources.length) {
             replaceResource = this.resources[options.index];
@@ -2305,9 +2303,7 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
     // 否则使用 document 进行保存 (如果有)
     const docRef = this.documentModelManager.getModelReference(resource.uri);
     if (docRef) {
-      if (docRef.instance.dirty) {
-        await docRef.instance.save(undefined, reason);
-      }
+      await docRef.instance.save(undefined, reason);
       docRef.dispose();
     }
   }
@@ -2340,11 +2336,9 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
 
   hasDirty(): boolean {
     for (const r of this.resources) {
-      const docRef = this.documentModelManager.getModelReference(r.uri);
+      const docRef = this.documentModelManager.getModelDescription(r.uri);
       if (docRef) {
-        const isDirty = docRef.instance.dirty;
-        docRef.dispose();
-        if (isDirty) {
+        if (docRef.dirty) {
           return true;
         }
       }
@@ -2358,15 +2352,13 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
   calcDirtyCount(countedUris: Set<string> = new Set<string>()): number {
     let count = 0;
     for (const r of this.resources) {
-      const docRef = this.documentModelManager.getModelReference(r.uri, 'calc-dirty-count');
+      const docRef = this.documentModelManager.getModelDescription(r.uri, 'calc-dirty-count');
       if (countedUris.has(r.uri.toString())) {
         continue;
       }
       countedUris.add(r.uri.toString());
       if (docRef) {
-        const isDirty = docRef.instance.dirty;
-        docRef.dispose();
-        if (isDirty) {
+        if (docRef.dirty) {
           count += 1;
         }
       }

package/src/common/editor.ts

@@ -29,10 +29,66 @@ import type { ITextModel, ITextModelUpdateOptions } from '@opensumi/monaco-edito
 
 export { ShowLightbulbIconMode } from '@opensumi/ide-monaco';
 
+export interface IEditorDocumentDescription {
+  /**
+   * 文档URI
+   */
+  readonly uri: URI;
+
+  /**
+   * A unique identifier associated with this model.
+   */
+  readonly id: string;
+
+  /**
+   * 编码
+   */
+  readonly encoding: string;
+
+  /**
+   * 行末结束
+   */
+  readonly eol: EOL;
+
+  /**
+   * 语言Id
+   */
+  readonly languageId: string;
+
+  /**
+   * 是否被修改过
+   */
+  readonly dirty: boolean;
+
+  /**
+   * 能否修改
+   */
+  readonly readonly: boolean;
+
+  /**
+   * 能否保存
+   */
+  readonly savable: boolean;
+
+  /**
+   * 是否永远都显示 dirty
+   */
+  readonly alwaysDirty: boolean;
+
+  /**
+   * 即便是 dirty 也要被 dispose
+   */
+  readonly disposeEvenDirty: boolean;
+
+  /**
+   * 是否关闭自动保存功能
+   */
+  readonly closeAutoSave: boolean;
+}
+
 /**
  * editorDocumentModel is a wrapped concept for monaco's textModel
  */
-
 export interface IEditorDocumentModel extends IDisposable {
   /**
    * 文档URI
@@ -636,6 +692,8 @@ export interface IResourceOpenOptions {
    * 当关闭时指定 force 参数，用来跳过 shouldClose 等逻辑
    */
   forceClose?: boolean;
+
+  supportsRevive?: boolean;
 }
 
 export interface IResourceOpenResult {