@opensumi/ide-editor 3.3.4-next-1727344885.0 → 3.3.4-next-1729497448.0

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

@@ -1,5 +1,5 @@
 import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
-import { IContextKeyService, IRange, PreferenceService } from '@opensumi/ide-core-browser';
+import { AppConfig, IContextKeyService, IRange, PreferenceService } from '@opensumi/ide-core-browser';
 import { ResourceContextKey } from '@opensumi/ide-core-browser/lib/contextkey';
 import { MonacoService } from '@opensumi/ide-core-browser/lib/monaco';
 import {
@@ -9,7 +9,6 @@ import {
   Emitter as EventEmitter,
   ILineChange,
   ISelection,
-  LRUCache,
   OnEvent,
   URI,
   WithEventBus,
@@ -32,7 +31,7 @@ import {
   IUndoStopOptions,
   ResourceDecorationNeedChangeEvent,
 } from '../common';
-import { IEditorDocumentModel, IEditorDocumentModelRef } from '../common/editor';
+import { IEditorDocumentModel, IEditorDocumentModelRef, isTextEditorViewState } from '../common/editor';
 
 import { MonacoEditorDecorationApplier } from './decoration-applier';
 import { EditorDocumentModelContentChangedEvent, IEditorDocumentModelService } from './doc-model/types';
@@ -514,7 +513,7 @@ export class BrowserCodeEditor extends BaseMonacoEditorWrapper implements ICodeE
   protected restoreState() {
     if (this.currentUri) {
       const state = this.editorState.get(this.currentUri.toString());
-      if (state) {
+      if (isTextEditorViewState(state)) {
         this.monacoEditor.restoreViewState(state);
       }
     }
@@ -559,6 +558,9 @@ export class BrowserDiffEditor extends WithEventBus implements IDiffEditor {
   @Autowired(EditorCollectionService)
   private collectionService: EditorCollectionServiceImpl;
 
+  @Autowired(AppConfig)
+  private appConfig: AppConfig;
+
   private originalDocModelRef: IEditorDocumentModelRef | null;
 
   private modifiedDocModelRef: IEditorDocumentModelRef | null;
@@ -605,8 +607,6 @@ export class BrowserDiffEditor extends WithEventBus implements IDiffEditor {
 
   public onRefOpen = this._onRefOpen.event;
 
-  private diffEditorModelCache = new LRUCache<string, monaco.editor.IDiffEditorViewModel>(100);
-
   protected saveCurrentState() {
     if (this.currentUri) {
       const state = this.monacoDiffEditor.saveViewState();
@@ -616,10 +616,13 @@ export class BrowserDiffEditor extends WithEventBus implements IDiffEditor {
     }
   }
 
-  protected restoreState() {
+  protected restoreState(options: IResourceOpenOptions) {
     if (this.currentUri) {
       const state = this.editorState.get(this.currentUri.toString());
-      if (state) {
+      if (isTextEditorViewState(state)) {
+        if (options.range || options.originalRange) {
+          state.modified!.cursorState = []; // 避免重复的选中态
+        }
         this.monacoDiffEditor.restoreViewState(state);
       }
     }
@@ -638,11 +641,6 @@ export class BrowserDiffEditor extends WithEventBus implements IDiffEditor {
     );
   }
 
-  disposeModel(originalUri: string, modifiedUri: string) {
-    const key = `${originalUri}-${modifiedUri}`;
-    this.diffEditorModelCache.delete(key);
-  }
-
   async compare(
     originalDocModelRef: IEditorDocumentModelRef,
     modifiedDocModelRef: IEditorDocumentModelRef,
@@ -657,13 +655,7 @@ export class BrowserDiffEditor extends WithEventBus implements IDiffEditor {
     }
     const original = this.originalDocModel.getMonacoModel();
     const modified = this.modifiedDocModel.getMonacoModel();
-    const key = `${original.uri.toString()}-${modified.uri.toString()}`;
-    let model = this.diffEditorModelCache.get(key);
-    if (!model) {
-      model = this.monacoDiffEditor.createViewModel({ original, modified });
-      this.diffEditorModelCache.set(key, model);
-    }
-
+    const model = this.monacoDiffEditor.createViewModel({ original, modified });
     this.monacoDiffEditor.setModel(model);
 
     if (rawUri) {
@@ -678,11 +670,14 @@ export class BrowserDiffEditor extends WithEventBus implements IDiffEditor {
         }),
       });
     }
+    await model?.waitForDiff();
+
+    // 需要等待 Diff 渲染，否则无法获取当前的 Diff 代码折叠状态
+    this.restoreState(options);
 
     if (options.range || options.originalRange) {
       const range = (options.range || options.originalRange) as monaco.IRange;
       const currentEditor = options.range ? this.modifiedEditor.monacoEditor : this.originalEditor.monacoEditor;
-      await model?.waitForDiff();
       // 必须使用 setTimeout, 因为两边的 editor 出现时机问题，diffEditor 是异步显示和渲染
       setTimeout(() => {
         currentEditor.revealRangeInCenter(range);
@@ -697,8 +692,6 @@ export class BrowserDiffEditor extends WithEventBus implements IDiffEditor {
           currentEditor.revealRangeInCenter(range);
         });
       });
-    } else {
-      this.restoreState();
     }
     this._onRefOpen.fire(originalDocModelRef);
     this._onRefOpen.fire(modifiedDocModelRef);

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

@@ -48,6 +48,7 @@ export class BaseFileSystemEditorDocumentProvider implements IEditorDocumentMode
   protected _fileContentMd5OnBrowserFs: Set<string> = new Set();
 
   private _detectedEncodingMap = new Map<string, string>();
+  private _detectedEolMap = new Map<string, EOL>();
 
   @Autowired(IFileServiceClient)
   protected readonly fileServiceClient: IFileServiceClient;
@@ -85,21 +86,15 @@ export class BaseFileSystemEditorDocumentProvider implements IEditorDocumentMode
   }
 
   async provideEOL(uri: URI) {
-    const backendOS = await this.applicationService.getBackendOS();
-    const eol = this.preferenceService.get<EOL | 'auto'>(
-      'files.eol',
-      'auto',
-      uri.toString(),
-      getLanguageIdFromMonaco(uri)!,
-    )!;
-
-    if (eol !== 'auto') {
-      return eol;
+    const cache = this._detectedEolMap.get(uri.toString());
+    if (cache) {
+      return cache;
     }
+    const backendOS = await this.applicationService.getBackendOS();
     return backendOS === OperatingSystem.Windows ? EOL.CRLF : EOL.LF;
   }
 
-  async read(uri: URI, options: ReadEncodingOptions): Promise<{ encoding: string; content: string }> {
+  async read(uri: URI, options: ReadEncodingOptions): Promise<{ encoding: string; content: string; eol: EOL }> {
     const { content: buffer } = await this.fileServiceClient.readFile(uri.toString());
 
     const guessEncoding =
@@ -118,19 +113,63 @@ export class BaseFileSystemEditorDocumentProvider implements IEditorDocumentMode
 
     const content = buffer.toString(detected.encoding);
 
+    const eol = await this.getEol(uri, content);
     const uriString = uri.toString();
 
     this._detectedEncodingMap.set(uriString, detected.encoding);
+    this._detectedEolMap.set(uriString, eol);
 
-    // 记录表示这个文档被[这个editorDocumentProvider]引用了
+    // 记录表示这个文档被引用了
     this._fileContentMd5OnBrowserFs.add(uriString);
 
     return {
       encoding: detected.encoding || UTF8,
       content,
+      eol,
     };
   }
 
+  private async getEol(uri: URI, content: string) {
+    const contentToDetect = content.slice(0, 2000);
+    let cr = 0;
+    let lf = 0;
+    let crlf = 0;
+    const len = contentToDetect.length;
+    for (let i = 0; i < len; i++) {
+      if (contentToDetect[i] === '\r') {
+        if (contentToDetect[i + 1] === '\n') {
+          crlf++;
+          // 跳过后续 \n
+          i++;
+        } else {
+          cr++;
+        }
+      } else if (contentToDetect[i] === '\n') {
+        lf++;
+      }
+    }
+
+    const totalEOLCount = cr + lf + crlf;
+    const totalCRCount = cr + crlf;
+    const eol = this.preferenceService.get<EOL | 'auto'>(
+      'files.eol',
+      'auto',
+      uri.toString(),
+      getLanguageIdFromMonaco(uri)!,
+    )!;
+    if (eol !== 'auto') {
+      return eol;
+    }
+    const defaultEOL = await this.provideEOL(uri);
+    if (totalEOLCount === 0) {
+      return defaultEOL;
+    }
+    if (totalCRCount > totalEOLCount / 2) {
+      return EOL.CRLF;
+    }
+    return EOL.LF;
+  }
+
   async provideEditorDocumentModelContent(uri: URI, encoding: string) {
     // TODO: 这部分要优化成buffer获取（长期来看是stream获取，encoding在哪一层做？）
     // 暂时还是使用 resolveContent 内提供的 decode 功能

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

@@ -1568,7 +1568,6 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
       const query = uri.getParsedQuery();
       this.doDisposeDocRef(new URI(query.original));
       this.doDisposeDocRef(new URI(query.modified));
-      this.diffEditor.disposeModel(query.original, query.modified);
     } else if (uri.scheme === 'mergeEditor') {
       this.mergeEditor && this.mergeEditor.dispose();
     } else {

package/src/common/editor.ts

@@ -22,6 +22,8 @@ import { IDocModelUpdateOptions } from './types';
 
 import type {
   EOL,
+  ICodeEditorViewState,
+  IDiffEditorViewState,
   IEditorOptions,
   ICodeEditor as IMonacoCodeEditor,
   ITextModel,
@@ -317,8 +319,6 @@ export interface IDiffEditor extends IDisposable {
   getLineChanges(): ILineChange[] | null;
 
   onRefOpen: Event<IEditorDocumentModelRef>;
-
-  disposeModel(originalUri: string, modifiedUri: string): void;
 }
 
 @Injectable()
@@ -989,3 +989,23 @@ export function getSimpleEditorOptions(): IEditorOptions {
  * in case the column does not exist yet.
  */
 export type EditorGroupColumn = number;
+
+export function isTextEditorViewState(candidate: unknown): candidate is ICodeEditorViewState | IDiffEditorViewState {
+  const viewState = candidate as (ICodeEditorViewState | IDiffEditorViewState) | undefined;
+  if (!viewState) {
+    return false;
+  }
+
+  const diffEditorViewState = viewState as IDiffEditorViewState;
+  if (diffEditorViewState.modified) {
+    return isTextEditorViewState(diffEditorViewState.modified);
+  }
+
+  const codeEditorViewState = viewState as ICodeEditorViewState;
+
+  return !!(
+    codeEditorViewState.contributionsState &&
+    codeEditorViewState.viewState &&
+    Array.isArray(codeEditorViewState.cursorState)
+  );
+}

package/src/common/notebook.ts

@@ -193,7 +193,4 @@ export interface INotebookService {
   onDidChangeNotebookDocument: Event<NotebookDocumentChangeDto>;
 }
 
-/**
- * @deprecated use Schemes.notebookCell
- */
 export const notebookCellScheme = 'vscode-notebook-cell';