@opensumi/ide-editor 3.1.4-next-1719380894.0 → 3.1.4

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,
-  };
-}

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

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