@opensumi/ide-editor 3.1.2-next-1718766864.0 → 3.1.2-next-1718952012.0

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

@@ -0,0 +1,7 @@
+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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,51 @@
+"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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,14 @@
+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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,66 @@
+"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

@@ -0,0 +1 @@
+{"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/lib/browser/merge-conflict/types.d.ts

@@ -32,23 +32,6 @@ export interface IDocumentMergeConflictDescriptor {
 export interface ICacheDocumentMergeConflict extends IDocumentMergeConflictDescriptor {
     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 declare enum NavigationDirection {
-    Forwards = 0,
-    Backwards = 1
-}
 export declare namespace AI_COMMAND {
     const ACCEPT: string;
     const REVERT: string;

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-conflict/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAE/C,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;CACjC;AAED,0BAAkB,UAAU;IAC1B,OAAO,IAAA;IACP,QAAQ,IAAA;IACR,IAAI,IAAA;CACL;AAED,MAAM,WAAW,uBAAuB;IACtC,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,oBAAoB,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,sBAAuB,SAAQ,gCAAgC;IAC9E,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;IAClF,SAAS,CACP,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,EAClC,IAAI,EAAE;QAAE,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAC5D,IAAI,CAAC;CACT;AAED,MAAM,WAAW,gCAAgC;IAC/C,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;IACpB,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,YAAY,CAAC;IACvB,eAAe,EAAE,YAAY,EAAE,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC;CACxB;AAED,MAAM,WAAW,2BAA4B,SAAQ,gCAAgC;IACnF,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,6BAA6B;IAC5C,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,WAAW,CAAC,sBAAsB,EAAE,CAAC,CAAC;IACxF,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC;IACvD,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;CAClD;AAED,MAAM,WAAW,oCAAoC;IACnD,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,6BAA6B,CAAC;IAC7D,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;CAClD;AAED,MAAM,WAAW,uCAAuC;IACtD,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,sBAAsB,CAAC;CACnC;AAED,oBAAY,mBAAmB;IAC7B,QAAQ,IAAA;IACR,SAAS,IAAA;CACV;AAED,yBAAiB,UAAU,CAAC;IAEnB,MAAM,MAAM,QAAgC,CAAC;IAC7C,MAAM,MAAM,QAAgC,CAAC;CACrD"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-conflict/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAE/C,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;CACjC;AAED,0BAAkB,UAAU;IAC1B,OAAO,IAAA;IACP,QAAQ,IAAA;IACR,IAAI,IAAA;CACL;AAED,MAAM,WAAW,uBAAuB;IACtC,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,oBAAoB,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,sBAAuB,SAAQ,gCAAgC;IAC9E,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;IAClF,SAAS,CACP,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,EAClC,IAAI,EAAE;QAAE,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAC5D,IAAI,CAAC;CACT;AAED,MAAM,WAAW,gCAAgC;IAC/C,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;IACpB,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,YAAY,CAAC;IACvB,eAAe,EAAE,YAAY,EAAE,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC;CACxB;AAED,MAAM,WAAW,2BAA4B,SAAQ,gCAAgC;IACnF,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,yBAAiB,UAAU,CAAC;IAEnB,MAAM,MAAM,QAAgC,CAAC;IAC7C,MAAM,MAAM,QAAgC,CAAC;CACrD"}

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

@@ -1,11 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AI_COMMAND = exports.NavigationDirection = void 0;
-var NavigationDirection;
-(function (NavigationDirection) {
-    NavigationDirection[NavigationDirection["Forwards"] = 0] = "Forwards";
-    NavigationDirection[NavigationDirection["Backwards"] = 1] = "Backwards";
-})(NavigationDirection = exports.NavigationDirection || (exports.NavigationDirection = {}));
+exports.AI_COMMAND = void 0;
 var AI_COMMAND;
 (function (AI_COMMAND) {
     const MERGE_CONFLICT = 'merge-conflict';

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/browser/merge-conflict/types.ts"],"names":[],"mappings":";;;AA2DA,IAAY,mBAGX;AAHD,WAAY,mBAAmB;IAC7B,qEAAQ,CAAA;IACR,uEAAS,CAAA;AACX,CAAC,EAHW,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAG9B;AAED,IAAiB,UAAU,CAI1B;AAJD,WAAiB,UAAU;IACzB,MAAM,cAAc,GAAG,gBAAgB,CAAC;IAC3B,iBAAM,GAAG,GAAG,cAAc,YAAY,CAAC;IACvC,iBAAM,GAAG,GAAG,cAAc,YAAY,CAAC;AACtD,CAAC,EAJgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAI1B"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/browser/merge-conflict/types.ts"],"names":[],"mappings":";;;AA2CA,IAAiB,UAAU,CAI1B;AAJD,WAAiB,UAAU;IACzB,MAAM,cAAc,GAAG,gBAAgB,CAAC;IAC3B,iBAAM,GAAG,GAAG,cAAc,YAAY,CAAC;IACvC,iBAAM,GAAG,GAAG,cAAc,YAAY,CAAC;AACtD,CAAC,EAJgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAI1B"}

package/lib/browser/merge-editor/MergeEditorFloatComponents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MergeEditorFloatComponents.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/MergeEditorFloatComponents.tsx"],"names":[],"mappings":"AAEA,OAAO,EAML,GAAG,EAEJ,MAAM,4BAA4B,CAAC;AAOpC,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEhD,eAAO,MAAM,0BAA0B,EAAE,oBAAoB,CAAC;IAAE,GAAG,EAAE,GAAG,CAAA;CAAE,CAsFzE,CAAC"}
+{"version":3,"file":"MergeEditorFloatComponents.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/MergeEditorFloatComponents.tsx"],"names":[],"mappings":"AAEA,OAAO,EAKL,GAAG,EAEJ,MAAM,4BAA4B,CAAC;AAKpC,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEhD,eAAO,MAAM,0BAA0B,EAAE,oBAAoB,CAAC;IAAE,GAAG,EAAE,GAAG,CAAA;CAAE,CAsDzE,CAAC"}

package/lib/browser/merge-editor/MergeEditorFloatComponents.js

@@ -4,53 +4,21 @@ exports.MergeEditorFloatComponents = void 0;
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importStar(require("react"));
 const ide_core_browser_1 = require("@opensumi/ide-core-browser");
-const ide_core_common_1 = require("@opensumi/ide-core-common");
-const git_1 = require("@opensumi/ide-core-common/lib/commands/git");
 const merge_actions_1 = require("@opensumi/ide-monaco/lib/browser/contrib/merge-editor/components/merge-actions");
-const useEditor_1 = require("../hooks/useEditor");
-const merge_conflict_1 = require("../merge-conflict");
+const merge_conflict_model_1 = require("../merge-conflict/merge-conflict.model");
+const merge_conflict_service_1 = require("../merge-conflict/merge-conflict.service");
 const MergeEditorFloatComponents = ({ resource }) => {
     const { uri } = resource;
-    const editorModel = (0, useEditor_1.useEditorDocumentModelRef)(uri);
-    const mergeConflictParser = (0, ide_core_browser_1.useInjectable)(merge_conflict_1.MergeConflictParser);
+    const mergeConflictService = (0, ide_core_browser_1.useInjectable)(merge_conflict_service_1.MergeConflictService);
     const commandService = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.CommandService);
     const commandRegistry = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.CommandRegistry);
-    const [isVisiable, setIsVisiable] = (0, react_1.useState)(false);
-    const [conflicts, setConflicts] = (0, react_1.useState)([]);
-    (0, react_1.useEffect)(() => {
-        const disposables = new ide_core_browser_1.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 { canNavigate, isVisiable, summary } = (0, merge_conflict_model_1.useMergeConflictModel)(uri);
     const [isAIResolving, setIsAIResolving] = (0, react_1.useState)(false);
     const handlePrev = (0, react_1.useCallback)(() => {
-        commandService.tryExecuteCommand(git_1.MergeConflictCommands.Previous).then(() => {
-            // TODO: 编辑器向上滚动一行
-        });
+        mergeConflictService.navigatePrevious();
     }, []);
     const handleNext = (0, react_1.useCallback)(() => {
-        commandService.tryExecuteCommand(git_1.MergeConflictCommands.Next).then(() => {
-            // TODO: 编辑器向上滚动一行
-        });
+        mergeConflictService.navigateNext();
     }, []);
     const handleAIResolve = (0, react_1.useCallback)(async () => {
         setIsAIResolving(true);
@@ -65,8 +33,7 @@ const MergeEditorFloatComponents = ({ resource }) => {
     if (!isVisiable) {
         return null;
     }
-    const summary = (0, ide_core_common_1.formatLocalize)('merge-conflicts.merge.conflict.remain', conflicts.length);
-    return (react_1.default.createElement(merge_actions_1.MergeActions, { uri: uri, editorType: 'text', summary: summary, handleNext: handleNext, handlePrev: handlePrev, isAIResolving: isAIResolving, onAIResolve: handleAIResolve, onReset: () => {
+    return (react_1.default.createElement(merge_actions_1.MergeActions, { uri: uri, editorType: 'text', summary: summary, canNavigate: canNavigate, handleNext: handleNext, handlePrev: handlePrev, isAIResolving: isAIResolving, onAIResolve: handleAIResolve, onReset: () => {
             commandService.executeCommand(ide_core_browser_1.MERGE_CONFLICT_COMMANDS.ALL_RESET.id, uri);
         }, onSwitchEditor: () => {
             [ide_core_browser_1.SCM_COMMANDS.GIT_OPEN_MERGE_EDITOR, ide_core_browser_1.SCM_COMMANDS._GIT_OPEN_MERGE_EDITOR].forEach(({ id: command }) => {

package/lib/browser/merge-editor/MergeEditorFloatComponents.js.map

@@ -1 +1 @@
-{"version":3,"file":"MergeEditorFloatComponents.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/MergeEditorFloatComponents.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"MergeEditorFloatComponents.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/MergeEditorFloatComponents.tsx"],"names":[],"mappings":";;;;AAAA,uDAAqD;AAErD,iEAOoC;AACpC,kHAA8G;AAE9G,iFAA+E;AAC/E,qFAAgF;AAGzE,MAAM,0BAA0B,GAAuC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC7F,MAAM,EAAE,GAAG,EAAE,GAAG,QAAQ,CAAC;IACzB,MAAM,oBAAoB,GAAG,IAAA,gCAAa,EAAuB,6CAAoB,CAAC,CAAC;IACvF,MAAM,cAAc,GAAG,IAAA,gCAAa,EAAiB,iCAAc,CAAC,CAAC;IACrE,MAAM,eAAe,GAAG,IAAA,gCAAa,EAAkB,kCAAe,CAAC,CAAC;IAExE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,IAAA,4CAAqB,EAAC,GAAG,CAAC,CAAC;IAExE,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAE1D,MAAM,UAAU,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QAClC,oBAAoB,CAAC,gBAAgB,EAAE,CAAC;IAC1C,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,UAAU,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QAClC,oBAAoB,CAAC,YAAY,EAAE,CAAC;IACtC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,eAAe,GAAG,IAAA,mBAAW,EAAC,KAAK,IAAI,EAAE;QAC7C,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACvB,IAAI,aAAa,EAAE;YACjB,MAAM,cAAc,CAAC,cAAc,CAAC,0CAAuB,CAAC,kBAAkB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;SACzF;aAAM;YACL,MAAM,cAAc,CAAC,cAAc,CAAC,0CAAuB,CAAC,aAAa,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;SACpF;QACD,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC,EAAE,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC;IAEzB,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,IAAI,CAAC;KACb;IAED,OAAO,CACL,8BAAC,4BAAY,IACX,GAAG,EAAE,GAAG,EACR,UAAU,EAAC,MAAM,EACjB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,eAAe,EAC5B,OAAO,EAAE,GAAG,EAAE;YACZ,cAAc,CAAC,cAAc,CAAC,0CAAuB,CAAC,SAAS,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC3E,CAAC,EACD,cAAc,EAAE,GAAG,EAAE;YACnB,CAAC,+BAAY,CAAC,qBAAqB,EAAE,+BAAY,CAAC,sBAAsB,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;gBACpG,IAAI,eAAe,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,eAAe,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;oBAC7E,cAAc,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;iBAC7C;YACH,CAAC,CAAC,CAAC;QACL,CAAC,GACD,CACH,CAAC;AACJ,CAAC,CAAC;AAtDW,QAAA,0BAA0B,8BAsDrC"}

package/package.json

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

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

@@ -0,0 +1,63 @@
+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,
+  };
+}

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

@@ -0,0 +1,65 @@
+import { Autowired, Injectable } from '@opensumi/di';
+import * as monaco from '@opensumi/ide-monaco';
+import { NavigationDirection, findRangeForNavigation } from '@opensumi/ide-monaco/lib/browser/contrib/merge-editor';
+import { IMessageService } from '@opensumi/ide-overlay';
+
+import { IEditor, WorkbenchEditorService } from '../types';
+
+import { DocumentMergeConflict, MergeConflictParser } from './conflict-parser';
+
+@Injectable()
+export class MergeConflictService {
+  @Autowired(MergeConflictParser)
+  parser: MergeConflictParser;
+
+  @Autowired(WorkbenchEditorService)
+  private readonly editorService: WorkbenchEditorService;
+
+  @Autowired(IMessageService)
+  private readonly messageService: IMessageService;
+
+  conflicts = [] as DocumentMergeConflict[];
+
+  scanDocument(model: monaco.editor.ITextModel) {
+    this.conflicts = this.parser.scanDocument(model);
+    return this.conflicts.length;
+  }
+
+  clear(): void {
+    this.conflicts = [];
+  }
+
+  private async navigate(editor: IEditor, direction: NavigationDirection): Promise<void> {
+    this.conflicts = this.parser.scanDocument(editor.monacoEditor.getModel()!);
+    const ranges = this.conflicts.map((conflict) => conflict.range);
+
+    const navigationResult = 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(): Promise<void> {
+    return this.navigate(this.editorService.currentEditor!, NavigationDirection.Forwards);
+  }
+
+  navigatePrevious(): Promise<void> {
+    return this.navigate(this.editorService.currentEditor!, NavigationDirection.Backwards);
+  }
+}

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

@@ -41,27 +41,6 @@ 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,72 +1,37 @@
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, 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 { useEditorDocumentModelRef } from '../hooks/useEditor';
-import { DocumentMergeConflict, MergeConflictParser } from '../merge-conflict';
+import { useMergeConflictModel } from '../merge-conflict/merge-conflict.model';
+import { MergeConflictService } from '../merge-conflict/merge-conflict.service';
 import { ReactEditorComponent } from '../types';
 
 export const MergeEditorFloatComponents: ReactEditorComponent<{ uri: URI }> = ({ resource }) => {
   const { uri } = resource;
-  const editorModel = useEditorDocumentModelRef(uri);
-  const mergeConflictParser: MergeConflictParser = useInjectable(MergeConflictParser);
+  const mergeConflictService = useInjectable<MergeConflictService>(MergeConflictService);
   const commandService = useInjectable<CommandService>(CommandService);
   const commandRegistry = useInjectable<CommandRegistry>(CommandRegistry);
 
-  const [isVisiable, setIsVisiable] = useState(false);
-  const [conflicts, setConflicts] = useState<DocumentMergeConflict[]>([]);
-
-  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 { canNavigate, isVisiable, summary } = useMergeConflictModel(uri);
 
   const [isAIResolving, setIsAIResolving] = useState(false);
+
   const handlePrev = useCallback(() => {
-    commandService.tryExecuteCommand(MergeConflictCommands.Previous).then(() => {
-      // TODO: 编辑器向上滚动一行
-    });
+    mergeConflictService.navigatePrevious();
   }, []);
 
   const handleNext = useCallback(() => {
-    commandService.tryExecuteCommand(MergeConflictCommands.Next).then(() => {
-      // TODO: 编辑器向上滚动一行
-    });
+    mergeConflictService.navigateNext();
   }, []);
+
   const handleAIResolve = useCallback(async () => {
     setIsAIResolving(true);
     if (isAIResolving) {
@@ -81,12 +46,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}