@opensumi/ide-editor 3.1.2-next-1718957810.0 → 3.1.2

package/package.json

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

package/src/browser/component.ts

@@ -108,7 +108,7 @@ export class EditorComponentRegistryImpl implements EditorComponentRegistry {
     let results: IEditorOpenType[] = [];
     const resolvers = this.getResolvers(resource.uri.scheme).slice(); // 防止异步操作时数组被改变
     let shouldBreak = false;
-    const resolve = (res: IEditorOpenType[]) => {
+    const resolve = (res) => {
       results = res;
       shouldBreak = true;
     };

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

@@ -562,8 +562,6 @@ export class BrowserDiffEditor extends WithEventBus implements IDiffEditor {
 
   private modifiedDocModelRef: IEditorDocumentModelRef | null;
 
-  private diffEditorModelCache = new LRUCache<string, monaco.editor.IDiffEditorViewModel>(100);
-
   get originalDocModel() {
     if (this.originalDocModelRef && !this.originalDocModelRef.disposed) {
       return this.originalDocModelRef.instance;
@@ -602,10 +600,6 @@ export class BrowserDiffEditor extends WithEventBus implements IDiffEditor {
 
   private diffResourceKeys: ResourceContextKey[];
 
-  private _onRefOpen = new Emitter<IEditorDocumentModelRef>();
-
-  public onRefOpen = this._onRefOpen.event;
-
   protected saveCurrentState() {
     if (this.currentUri) {
       const state = this.monacoDiffEditor.saveViewState();
@@ -651,13 +645,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 as any)._store.isDisposed) {
-      model = this.monacoDiffEditor.createViewModel({ original, modified });
-      this.diffEditorModelCache.set(key, model);
-    }
-
+    const model = this.monacoDiffEditor.createViewModel({ original, modified });
     this.monacoDiffEditor.setModel(model);
 
     if (rawUri) {
@@ -666,7 +654,6 @@ export class BrowserDiffEditor extends WithEventBus implements IDiffEditor {
       this.currentUri = URI.from({
         scheme: DIFF_SCHEME,
         query: URI.stringifyQuery({
-          name,
           original: this.originalDocModel!.uri.toString(),
           modified: this.modifiedDocModel!.uri.toString(),
         }),
@@ -676,6 +663,7 @@ export class BrowserDiffEditor extends WithEventBus implements IDiffEditor {
     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);
@@ -693,8 +681,6 @@ export class BrowserDiffEditor extends WithEventBus implements IDiffEditor {
     } else {
       this.restoreState();
     }
-    this._onRefOpen.fire(originalDocModelRef);
-    this._onRefOpen.fire(modifiedDocModelRef);
     const enableHideUnchanged = this.preferenceService.get('diffEditor.hideUnchangedRegions.enabled');
 
     if (options.revealFirstDiff && !enableHideUnchanged) {
@@ -752,7 +738,6 @@ export class BrowserDiffEditor extends WithEventBus implements IDiffEditor {
   }
 
   updateDiffOptions() {
-    this.diffEditorModelCache.clear();
     this.doUpdateDiffOptions();
   }
 
@@ -822,7 +807,6 @@ export class BrowserDiffEditor extends WithEventBus implements IDiffEditor {
     super.dispose();
     this.collectionService.removeEditors([this.originalEditor, this.modifiedEditor]);
     this.collectionService.removeDiffEditors([this]);
-    this.diffEditorModelCache.clear();
     this.monacoDiffEditor.dispose();
     this._disposed = true;
   }

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

@@ -110,10 +110,7 @@ export class BaseFileSystemEditorDocumentProvider implements IEditorDocumentMode
         uri.toString(),
         getLanguageIdFromMonaco(uri)!,
       );
-
-    // TODO: 应该挪到后端去做
     const detected = await detectEncodingFromBuffer(buffer, guessEncoding);
-
     detected.encoding = await this.getReadEncoding(uri, options, detected.encoding);
 
     const content = buffer.toString(detected.encoding);
@@ -135,7 +132,6 @@ export class BaseFileSystemEditorDocumentProvider implements IEditorDocumentMode
     // TODO: 这部分要优化成buffer获取（长期来看是stream获取，encoding在哪一层做？）
     // 暂时还是使用 resolveContent 内提供的 decode 功能
     // 之后 encoding 做了分层之后和其他的需要 decode 的地方一起改
-
     return (await this.read(uri, { encoding })).content;
   }
 

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

@@ -129,6 +129,7 @@ export class FileSystemResourceProvider extends WithEventBus implements IResourc
   }
 
   async provideResource(uri: URI): Promise<IResource<any>> {
+    // 获取文件类型 getFileType: (path: string) => string
     await this.ready;
     this.involvedFiles.add(uri.codeUri.fsPath);
     return Promise.all([

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

@@ -41,6 +41,27 @@ export interface ICacheDocumentMergeConflict extends IDocumentMergeConflictDescr
   aiContent?: string;
 }
 
+export interface IDocumentMergeConflictTracker {
+  getConflicts(document: monaco.editor.ITextModel): PromiseLike<IDocumentMergeConflict[]>;
+  isPending(document: monaco.editor.ITextModel): boolean;
+  forget(document: monaco.editor.ITextModel): void;
+}
+
+export interface IDocumentMergeConflictTrackerService {
+  createTracker(origin: string): IDocumentMergeConflictTracker;
+  forget(document: monaco.editor.ITextModel): void;
+}
+
+export interface IDocumentMergeConflictNavigationResults {
+  canNavigate: boolean;
+  conflict?: IDocumentMergeConflict;
+}
+
+export enum NavigationDirection {
+  Forwards,
+  Backwards,
+}
+
 export namespace AI_COMMAND {
   const MERGE_CONFLICT = 'merge-conflict';
   export const ACCEPT = `${MERGE_CONFLICT}.ai.accept`;

package/src/browser/merge-editor/MergeEditorFloatComponents.tsx

@@ -1,37 +1,72 @@
-import React, { useCallback, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 
 import {
   CommandRegistry,
   CommandService,
+  DisposableStore,
   MERGE_CONFLICT_COMMANDS,
   SCM_COMMANDS,
   URI,
   useInjectable,
 } from '@opensumi/ide-core-browser';
+import { formatLocalize } from '@opensumi/ide-core-common';
+import { MergeConflictCommands } from '@opensumi/ide-core-common/lib/commands/git';
 import { MergeActions } from '@opensumi/ide-monaco/lib/browser/contrib/merge-editor/components/merge-actions';
 
-import { useMergeConflictModel } from '../merge-conflict/merge-conflict.model';
-import { MergeConflictService } from '../merge-conflict/merge-conflict.service';
+import { useEditorDocumentModelRef } from '../hooks/useEditor';
+import { DocumentMergeConflict, MergeConflictParser } from '../merge-conflict';
 import { ReactEditorComponent } from '../types';
 
 export const MergeEditorFloatComponents: ReactEditorComponent<{ uri: URI }> = ({ resource }) => {
   const { uri } = resource;
-  const mergeConflictService = useInjectable<MergeConflictService>(MergeConflictService);
+  const editorModel = useEditorDocumentModelRef(uri);
+  const mergeConflictParser: MergeConflictParser = useInjectable(MergeConflictParser);
   const commandService = useInjectable<CommandService>(CommandService);
   const commandRegistry = useInjectable<CommandRegistry>(CommandRegistry);
 
-  const { canNavigate, isVisiable, summary } = useMergeConflictModel(uri);
+  const [isVisiable, setIsVisiable] = useState(false);
+  const [conflicts, setConflicts] = useState<DocumentMergeConflict[]>([]);
 
-  const [isAIResolving, setIsAIResolving] = useState(false);
+  useEffect(() => {
+    const disposables = new DisposableStore();
+
+    if (editorModel) {
+      const { instance } = editorModel;
+      const run = () => {
+        const conflicts = mergeConflictParser.scanDocument(instance.getMonacoModel());
+        if (conflicts.length > 0) {
+          setIsVisiable(true);
+          setConflicts(conflicts);
+        } else {
+          setIsVisiable(false);
+          setConflicts([]);
+        }
+      };
+
+      disposables.add(
+        editorModel.instance.getMonacoModel().onDidChangeContent(() => {
+          run();
+        }),
+      );
+      run();
+      return () => {
+        disposables.dispose();
+      };
+    }
+  }, [editorModel]);
 
+  const [isAIResolving, setIsAIResolving] = useState(false);
   const handlePrev = useCallback(() => {
-    mergeConflictService.navigatePrevious();
+    commandService.tryExecuteCommand(MergeConflictCommands.Previous).then(() => {
+      // TODO: 编辑器向上滚动一行
+    });
   }, []);
 
   const handleNext = useCallback(() => {
-    mergeConflictService.navigateNext();
+    commandService.tryExecuteCommand(MergeConflictCommands.Next).then(() => {
+      // TODO: 编辑器向上滚动一行
+    });
   }, []);
-
   const handleAIResolve = useCallback(async () => {
     setIsAIResolving(true);
     if (isAIResolving) {
@@ -46,12 +81,12 @@ export const MergeEditorFloatComponents: ReactEditorComponent<{ uri: URI }> = ({
     return null;
   }
 
+  const summary = formatLocalize('merge-conflicts.merge.conflict.remain', conflicts.length);
   return (
     <MergeActions
       uri={uri}
       editorType='text'
       summary={summary}
-      canNavigate={canNavigate}
       handleNext={handleNext}
       handlePrev={handlePrev}
       isAIResolving={isAIResolving}

package/src/browser/preference/schema.ts

@@ -1631,7 +1631,7 @@ const customEditorSchema: PreferenceSchemaProperties = {
   },
   'editor.largeFile': {
     type: 'number',
-    default: 4 * 1024 * 1024 * 1024, // 4096 MB
+    default: 4 * 1024 * 1024 * 1024,
     description: '%editor.configuration.largeFileSize%',
   },
   'editor.quickSuggestionsDelay': {

package/src/browser/tab.view.tsx

@@ -391,7 +391,6 @@ export const Tabs = ({ group }: ITabsProps) => {
     const curTabIndex = group.resources.findIndex((resource) => group.currentResource === resource);
     return (
       <div
-        draggable={false}
         className={cls({
           [styles_kt_editor_tabs_content]: true,
           [styles_kt_editor_tabs_current_last]: curTabIndex === group.resources.length - 1,

package/src/browser/types.ts

@@ -114,10 +114,13 @@ export class RegisterEditorComponentEvent extends BasicEvent<string> {}
 export abstract class EditorComponentRegistry {
   abstract registerEditorComponent<T>(component: IEditorComponent<T>, initialProps?: any): IDisposable;
 
+  // 等同于 handlesScheme => 10
+  abstract registerEditorComponentResolver<T>(scheme: string, resolver: IEditorComponentResolver<T>): IDisposable;
+
+  // handlesScheme 返回权重， 小于 0 表示不处理
   abstract registerEditorComponentResolver<T>(
-    handlesScheme:
-      | string // 等同于 handlesScheme => 10
-      | ((scheme: string) => number), // handlesScheme 返回权重， 小于 0 表示不处理
+    // eslint-disable-next-line @typescript-eslint/unified-signatures
+    handlesScheme: (scheme: string) => number,
     resolver: IEditorComponentResolver<T>,
   ): IDisposable;
 

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

@@ -1539,29 +1539,34 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
   }
 
   async getDocumentModelRef(uri: URI): Promise<IEditorDocumentModelRef> {
-    if (!this.holdDocumentModelRefs.has(uri.toString())) {
+    const key = uri.toString();
+
+    if (!this.holdDocumentModelRefs.has(key)) {
       this.holdDocumentModelRefs.set(
-        uri.toString(),
+        key,
         await this.documentModelManager.createModelReference(uri, 'editor-group-' + this.name),
       );
     }
-    return this.holdDocumentModelRefs.get(uri.toString())!;
+    return this.holdDocumentModelRefs.get(key)!;
   }
 
   disposeDocumentRef(uri: URI) {
     if (uri.scheme === 'diff') {
-      // 针对 diff 编辑器，需要保留 DocumentModelRef，以保留实现对 DiffEditor 的状态恢复
+      const query = uri.getParsedQuery();
+      this.doDisposeDocRef(new URI(query.original));
+      this.doDisposeDocRef(new URI(query.modified));
     } else if (uri.scheme === 'mergeEditor') {
-      this.mergeEditor.dispose();
+      this.mergeEditor && this.mergeEditor.dispose();
     } else {
       this.doDisposeDocRef(uri);
     }
   }
 
   protected doDisposeDocRef(uri: URI) {
-    if (this.holdDocumentModelRefs.has(uri.toString())) {
-      this.holdDocumentModelRefs.get(uri.toString())!.dispose();
-      this.holdDocumentModelRefs.delete(uri.toString());
+    const key = uri.toString();
+    if (this.holdDocumentModelRefs.has(key)) {
+      this.holdDocumentModelRefs.get(key)!.dispose();
+      this.holdDocumentModelRefs.delete(key);
     }
   }
 
@@ -1654,7 +1659,6 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
       await this.diffEditor.compare(original, modified, options, resource.uri);
       if (options.focus) {
         this._domNode?.focus();
-        // 理由见上方 codeEditor.focus 部分
 
         const disposer = this.eventBus.on(CodeEditorDidVisibleEvent, (e) => {
           if (e.payload.groupName === this.name && e.payload.type === EditorOpenType.diff) {

package/src/common/editor.ts

@@ -257,8 +257,6 @@ export interface IDiffEditor extends IDisposable {
   focus(): void;
 
   getLineChanges(): ILineChange[] | null;
-
-  onRefOpen: Event<IEditorDocumentModelRef>;
 }
 
 @Injectable()

package/lib/browser/merge-conflict/merge-conflict.model.d.ts

@@ -1,7 +0,0 @@
-import { URI } from '@opensumi/ide-utils';
-export declare function useMergeConflictModel(uri: URI): {
-    isVisiable: boolean;
-    summary: string;
-    canNavigate: boolean;
-};
-//# sourceMappingURL=merge-conflict.model.d.ts.map

package/lib/browser/merge-conflict/merge-conflict.model.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"merge-conflict.model.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-conflict/merge-conflict.model.ts"],"names":[],"mappings":"AAIA,OAAO,EAAmB,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAM3D,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG;;;;EAoD7C"}

package/lib/browser/merge-conflict/merge-conflict.model.js

@@ -1,51 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useMergeConflictModel = void 0;
-const tslib_1 = require("tslib");
-const debounce_1 = tslib_1.__importDefault(require("lodash/debounce"));
-const react_1 = require("react");
-const ide_core_browser_1 = require("@opensumi/ide-core-browser");
-const ide_utils_1 = require("@opensumi/ide-utils");
-const useEditor_1 = require("../hooks/useEditor");
-const merge_conflict_service_1 = require("./merge-conflict.service");
-function useMergeConflictModel(uri) {
-    const editorModel = (0, useEditor_1.useEditorDocumentModelRef)(uri);
-    /**
-     * 如果是原来就有冲突的文件，当冲突没了之后，仍然显示冲突
-     */
-    const [isInitialVisiable, setIsInitialVisiable] = (0, react_1.useState)(false);
-    const [conflictsCount, setConflictsCount] = (0, react_1.useState)(0);
-    const mergeConflictService = (0, ide_core_browser_1.useInjectable)(merge_conflict_service_1.MergeConflictService);
-    const summary = (0, react_1.useMemo)(() => (0, ide_core_browser_1.formatLocalize)('merge-conflicts.merge.conflict.remain', conflictsCount), [conflictsCount]);
-    (0, react_1.useEffect)(() => {
-        const disposables = new ide_utils_1.DisposableStore();
-        if (editorModel) {
-            const { instance } = editorModel;
-            const run = () => {
-                const n = mergeConflictService.scanDocument(instance.getMonacoModel());
-                setConflictsCount(n);
-                if (n > 0) {
-                    setIsInitialVisiable(true);
-                }
-            };
-            const debounceRun = (0, debounce_1.default)(run, 150);
-            disposables.add(instance.getMonacoModel().onDidChangeContent(() => {
-                debounceRun();
-            }));
-            run();
-            return () => {
-                disposables.dispose();
-                mergeConflictService.clear();
-                setIsInitialVisiable(false);
-                setConflictsCount(0);
-            };
-        }
-    }, [editorModel]);
-    return {
-        isVisiable: isInitialVisiable,
-        summary,
-        canNavigate: conflictsCount > 0,
-    };
-}
-exports.useMergeConflictModel = useMergeConflictModel;
-//# sourceMappingURL=merge-conflict.model.js.map

package/lib/browser/merge-conflict/merge-conflict.model.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"merge-conflict.model.js","sourceRoot":"","sources":["../../../src/browser/merge-conflict/merge-conflict.model.ts"],"names":[],"mappings":";;;;AAAA,uEAAuC;AACvC,iCAAqD;AAErD,iEAA2E;AAC3E,mDAA2D;AAE3D,kDAA+D;AAE/D,qEAAgE;AAEhE,SAAgB,qBAAqB,CAAC,GAAQ;IAC5C,MAAM,WAAW,GAAG,IAAA,qCAAyB,EAAC,GAAG,CAAC,CAAC;IAEnD;;OAEG;IACH,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAClE,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,IAAA,gBAAQ,EAAC,CAAC,CAAC,CAAC;IAExD,MAAM,oBAAoB,GAAG,IAAA,gCAAa,EAAuB,6CAAoB,CAAC,CAAC;IAEvF,MAAM,OAAO,GAAG,IAAA,eAAO,EACrB,GAAG,EAAE,CAAC,IAAA,iCAAc,EAAC,uCAAuC,EAAE,cAAc,CAAC,EAC7E,CAAC,cAAc,CAAC,CACjB,CAAC;IAEF,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,MAAM,WAAW,GAAG,IAAI,2BAAe,EAAE,CAAC;QAE1C,IAAI,WAAW,EAAE;YACf,MAAM,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC;YACjC,MAAM,GAAG,GAAG,GAAG,EAAE;gBACf,MAAM,CAAC,GAAG,oBAAoB,CAAC,YAAY,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC;gBACvE,iBAAiB,CAAC,CAAC,CAAC,CAAC;gBACrB,IAAI,CAAC,GAAG,CAAC,EAAE;oBACT,oBAAoB,CAAC,IAAI,CAAC,CAAC;iBAC5B;YACH,CAAC,CAAC;YAEF,MAAM,WAAW,GAAG,IAAA,kBAAQ,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YAEvC,WAAW,CAAC,GAAG,CACb,QAAQ,CAAC,cAAc,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE;gBAChD,WAAW,EAAE,CAAC;YAChB,CAAC,CAAC,CACH,CAAC;YAEF,GAAG,EAAE,CAAC;YACN,OAAO,GAAG,EAAE;gBACV,WAAW,CAAC,OAAO,EAAE,CAAC;gBACtB,oBAAoB,CAAC,KAAK,EAAE,CAAC;gBAC7B,oBAAoB,CAAC,KAAK,CAAC,CAAC;gBAC5B,iBAAiB,CAAC,CAAC,CAAC,CAAC;YACvB,CAAC,CAAC;SACH;IACH,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAElB,OAAO;QACL,UAAU,EAAE,iBAAiB;QAC7B,OAAO;QACP,WAAW,EAAE,cAAc,GAAG,CAAC;KAChC,CAAC;AACJ,CAAC;AApDD,sDAoDC"}

package/lib/browser/merge-conflict/merge-conflict.service.d.ts

@@ -1,14 +0,0 @@
-import * as monaco from '@opensumi/ide-monaco';
-import { DocumentMergeConflict, MergeConflictParser } from './conflict-parser';
-export declare class MergeConflictService {
-    parser: MergeConflictParser;
-    private readonly editorService;
-    private readonly messageService;
-    conflicts: DocumentMergeConflict[];
-    scanDocument(model: monaco.editor.ITextModel): number;
-    clear(): void;
-    private navigate;
-    navigateNext(): Promise<void>;
-    navigatePrevious(): Promise<void>;
-}
-//# sourceMappingURL=merge-conflict.service.d.ts.map

package/lib/browser/merge-conflict/merge-conflict.service.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"merge-conflict.service.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-conflict/merge-conflict.service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAM/C,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAE/E,qBACa,oBAAoB;IAE/B,MAAM,EAAE,mBAAmB,CAAC;IAG5B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAyB;IAGvD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAkB;IAEjD,SAAS,0BAAiC;IAE1C,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU;IAK5C,KAAK,IAAI,IAAI;YAIC,QAAQ;IA0BtB,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;CAGlC"}

package/lib/browser/merge-conflict/merge-conflict.service.js

@@ -1,66 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MergeConflictService = void 0;
-const tslib_1 = require("tslib");
-const di_1 = require("@opensumi/di");
-const merge_editor_1 = require("@opensumi/ide-monaco/lib/browser/contrib/merge-editor");
-const ide_overlay_1 = require("@opensumi/ide-overlay");
-const types_1 = require("../types");
-const conflict_parser_1 = require("./conflict-parser");
-let MergeConflictService = class MergeConflictService {
-    constructor() {
-        this.conflicts = [];
-    }
-    scanDocument(model) {
-        this.conflicts = this.parser.scanDocument(model);
-        return this.conflicts.length;
-    }
-    clear() {
-        this.conflicts = [];
-    }
-    async navigate(editor, direction) {
-        this.conflicts = this.parser.scanDocument(editor.monacoEditor.getModel());
-        const ranges = this.conflicts.map((conflict) => conflict.range);
-        const navigationResult = (0, merge_editor_1.findRangeForNavigation)(direction, ranges, editor.monacoEditor.getPosition());
-        if (!navigationResult) {
-            this.messageService.warning('No merge conflicts found in this file');
-            return;
-        }
-        else if (!navigationResult.canNavigate) {
-            this.messageService.warning('No other merge conflicts within this file');
-            return;
-        }
-        else if (!navigationResult.range) {
-            // impossible path
-            return;
-        }
-        editor.monacoEditor.setPosition(navigationResult.range.getStartPosition());
-        // when navigating, we want to show the codelens on the first line of the conflict
-        const range = navigationResult.range.delta(-1);
-        editor.monacoEditor.revealRangeNearTopIfOutsideViewport(range);
-        editor.monacoEditor.focus();
-    }
-    navigateNext() {
-        return this.navigate(this.editorService.currentEditor, merge_editor_1.NavigationDirection.Forwards);
-    }
-    navigatePrevious() {
-        return this.navigate(this.editorService.currentEditor, merge_editor_1.NavigationDirection.Backwards);
-    }
-};
-tslib_1.__decorate([
-    (0, di_1.Autowired)(conflict_parser_1.MergeConflictParser),
-    tslib_1.__metadata("design:type", conflict_parser_1.MergeConflictParser)
-], MergeConflictService.prototype, "parser", void 0);
-tslib_1.__decorate([
-    (0, di_1.Autowired)(types_1.WorkbenchEditorService),
-    tslib_1.__metadata("design:type", types_1.WorkbenchEditorService)
-], MergeConflictService.prototype, "editorService", void 0);
-tslib_1.__decorate([
-    (0, di_1.Autowired)(ide_overlay_1.IMessageService),
-    tslib_1.__metadata("design:type", Object)
-], MergeConflictService.prototype, "messageService", void 0);
-MergeConflictService = tslib_1.__decorate([
-    (0, di_1.Injectable)()
-], MergeConflictService);
-exports.MergeConflictService = MergeConflictService;
-//# sourceMappingURL=merge-conflict.service.js.map

package/lib/browser/merge-conflict/merge-conflict.service.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"merge-conflict.service.js","sourceRoot":"","sources":["../../../src/browser/merge-conflict/merge-conflict.service.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AAErD,wFAAoH;AACpH,uDAAwD;AAExD,oCAA2D;AAE3D,uDAA+E;AAGxE,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAA1B;QAUL,cAAS,GAAG,EAA6B,CAAC;IA4C5C,CAAC;IA1CC,YAAY,CAAC,KAA+B;QAC1C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QACjD,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;IAC/B,CAAC;IAED,KAAK;QACH,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;IACtB,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,MAAe,EAAE,SAA8B;QACpE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAG,CAAC,CAAC;QAC3E,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEhE,MAAM,gBAAgB,GAAG,IAAA,qCAAsB,EAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,WAAW,EAAG,CAAC,CAAC;QAEvG,IAAI,CAAC,gBAAgB,EAAE;YACrB,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,uCAAuC,CAAC,CAAC;YACrE,OAAO;SACR;aAAM,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE;YACxC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,2CAA2C,CAAC,CAAC;YACzE,OAAO;SACR;aAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE;YAClC,kBAAkB;YAClB,OAAO;SACR;QAED,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,gBAAgB,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAE3E,kFAAkF;QAClF,MAAM,KAAK,GAAG,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAE/C,MAAM,CAAC,YAAY,CAAC,mCAAmC,CAAC,KAAK,CAAC,CAAC;QAC/D,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;IAC9B,CAAC;IAED,YAAY;QACV,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,aAAc,EAAE,kCAAmB,CAAC,QAAQ,CAAC,CAAC;IACxF,CAAC;IAED,gBAAgB;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,aAAc,EAAE,kCAAmB,CAAC,SAAS,CAAC,CAAC;IACzF,CAAC;CACF,CAAA;AArDC;IAAC,IAAA,cAAS,EAAC,qCAAmB,CAAC;sCACvB,qCAAmB;oDAAC;AAE5B;IAAC,IAAA,cAAS,EAAC,8BAAsB,CAAC;sCACF,8BAAsB;2DAAC;AAEvD;IAAC,IAAA,cAAS,EAAC,6BAAe,CAAC;;4DACsB;AARtC,oBAAoB;IADhC,IAAA,eAAU,GAAE;GACA,oBAAoB,CAsDhC;AAtDY,oDAAoB"}

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

@@ -1,63 +0,0 @@
-import debounce from 'lodash/debounce';
-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 { MergeConflictService } from './merge-conflict.service';
-
-export function useMergeConflictModel(uri: URI) {
-  const editorModel = useEditorDocumentModelRef(uri);
-
-  /**
-   * 如果是原来就有冲突的文件，当冲突没了之后，仍然显示冲突
-   */
-  const [isInitialVisiable, setIsInitialVisiable] = useState(false);
-  const [conflictsCount, setConflictsCount] = useState(0);
-
-  const mergeConflictService = useInjectable<MergeConflictService>(MergeConflictService);
-
-  const summary = useMemo(
-    () => formatLocalize('merge-conflicts.merge.conflict.remain', conflictsCount),
-    [conflictsCount],
-  );
-
-  useEffect(() => {
-    const disposables = new DisposableStore();
-
-    if (editorModel) {
-      const { instance } = editorModel;
-      const run = () => {
-        const n = mergeConflictService.scanDocument(instance.getMonacoModel());
-        setConflictsCount(n);
-        if (n > 0) {
-          setIsInitialVisiable(true);
-        }
-      };
-
-      const debounceRun = debounce(run, 150);
-
-      disposables.add(
-        instance.getMonacoModel().onDidChangeContent(() => {
-          debounceRun();
-        }),
-      );
-
-      run();
-      return () => {
-        disposables.dispose();
-        mergeConflictService.clear();
-        setIsInitialVisiable(false);
-        setConflictsCount(0);
-      };
-    }
-  }, [editorModel]);
-
-  return {
-    isVisiable: isInitialVisiable,
-    summary,
-    canNavigate: conflictsCount > 0,
-  };
-}