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

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