@opensumi/ide-editor 2.27.3-rc-1714116491.0 → 2.27.3-rc-1714982362.0

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

@@ -0,0 +1,73 @@
+import * as monaco from '@opensumi/ide-monaco';
+
+export interface IMergeRegion {
+  name: string;
+  header: monaco.Range;
+  content: monaco.Range;
+  decoratorContent?: monaco.Range;
+}
+
+export const enum CommitType {
+  Current,
+  Incoming,
+  Both,
+}
+
+export interface IExtensionConfiguration {
+  enableCodeLens: boolean;
+  enableDecorations: boolean;
+  enableEditorOverview: boolean;
+}
+
+export interface IDocumentMergeConflict extends IDocumentMergeConflictDescriptor {
+  commitEdit(type: CommitType, editor: monaco.editor.ITextModel): Thenable<boolean>;
+  applyEdit(
+    type: CommitType,
+    document: monaco.editor.ITextModel,
+    edit: { replace(range: monaco.Range, newText: string): void },
+  ): void;
+}
+
+export interface IDocumentMergeConflictDescriptor {
+  [x: string]: any;
+  range: monaco.Range;
+  current: IMergeRegion;
+  incoming: IMergeRegion;
+  commonAncestors: IMergeRegion[];
+  splitter: monaco.Range;
+}
+
+// 存储初始化内容
+export interface ICacheDocumentMergeConflict extends IDocumentMergeConflictDescriptor {
+  incomingContent: string;
+  currentContent: string;
+  bothContent: string;
+  aiContent?: string;
+  defaultContent: 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`;
+  export const REVERT = `${MERGE_CONFLICT}.ai.revert`;
+}

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

@@ -5,43 +5,65 @@ import {
   AINativeConfigService,
   CommandRegistry,
   CommandService,
-  IContextKeyService,
+  DisposableStore,
+  MERGE_CONFLICT_COMMANDS,
   SCM_COMMANDS,
   URI,
-  Uri,
   localize,
   useInjectable,
 } from '@opensumi/ide-core-browser';
+import { formatLocalize } from '@opensumi/ide-core-common';
+import { MergeConflictCommands } from '@opensumi/ide-core-common/lib/commands/git';
 
-import styles from '../editor.module.less';
+import { useEditorDocumentModelRef } from '../hooks/useEditor';
+import { useInMergeChanges } from '../hooks/useInMergeChanges';
+import { DocumentMergeConflict, MergeConflictParser } from '../merge-conflict';
 import { ReactEditorComponent } from '../types';
 
+import styles from './merge-editor.module.less';
+
 export const MergeEditorFloatComponents: ReactEditorComponent<{ uri: URI }> = ({ resource }) => {
   const aiNativeConfigService = useInjectable<AINativeConfigService>(AINativeConfigService);
   const commandService = useInjectable<CommandService>(CommandService);
   const commandRegistry = useInjectable<CommandRegistry>(CommandRegistry);
-  const contextKeyService = useInjectable<IContextKeyService>(IContextKeyService);
+  const mergeConflictParser: MergeConflictParser = useInjectable(MergeConflictParser);
+
+  const editorModel = useEditorDocumentModelRef(resource.uri);
 
   const [isVisiable, setIsVisiable] = useState(false);
+  const [conflicts, setConflicts] = useState<DocumentMergeConflict[]>([]);
 
-  const gitMergeChangesSet = new Set(['git.mergeChanges']);
+  const inMergeChanges = useInMergeChanges(resource.uri.toString());
 
   useEffect(() => {
-    const run = () => {
-      const mergeChanges = contextKeyService.getValue<Uri[]>('git.mergeChanges') || [];
-      setIsVisiable(mergeChanges.some((value) => value.toString() === resource.uri.toString()));
-    };
-
-    const disposed = contextKeyService.onDidChangeContext(({ payload }) => {
-      if (payload.affectsSome(gitMergeChangesSet)) {
-        run();
-      }
-    });
-    run();
-    return () => disposed.dispose();
-  }, [resource]);
+    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 [isAIResolving, setIsAIResolving] = useState(false);
   const handleOpenMergeEditor = useCallback(async () => {
     const { uri } = resource;
 
@@ -52,31 +74,35 @@ export const MergeEditorFloatComponents: ReactEditorComponent<{ uri: URI }> = ({
     });
   }, [resource]);
 
-  const isSupportAiResolve = useCallback(
+  const isSupportAIResolve = useCallback(
     () => aiNativeConfigService.capabilities.supportsConflictResolve,
     [aiNativeConfigService],
   );
 
-  const handlePrev = () => {
-    commandService.tryExecuteCommand('merge-conflict.previous');
-  };
+  const handlePrev = useCallback(() => {
+    commandService.tryExecuteCommand(MergeConflictCommands.Previous).then(() => {
+      // TODO: 编辑器向上滚动一行
+    });
+  }, []);
 
-  const handleNext = () => {
-    commandService.tryExecuteCommand('merge-conflict.next');
-  };
+  const handleNext = useCallback(() => {
+    commandService.tryExecuteCommand(MergeConflictCommands.Next).then(() => {
+      // TODO: 编辑器向上滚动一行
+    });
+  }, []);
 
   const handleAIResolve = useCallback(async () => {
-    setIsAiResolving(true);
-    if (isAiResolving) {
-      await commandService.executeCommand('merge-conflict.ai.all-accept-stop', resource.uri);
+    setIsAIResolving(true);
+    if (isAIResolving) {
+      await commandService.executeCommand(MERGE_CONFLICT_COMMANDS.AI_ALL_ACCEPT_STOP.id, resource.uri);
     } else {
-      await commandService.executeCommand('merge-conflict.ai.all-accept', resource.uri);
+      await commandService.executeCommand(MERGE_CONFLICT_COMMANDS.AI_ALL_ACCEPT.id, resource.uri);
     }
-    setIsAiResolving(false);
-  }, [resource, isAiResolving]);
+    setIsAIResolving(false);
+  }, [resource, isAIResolving]);
 
   const handleReset = useCallback(() => {
-    commandService.executeCommand('merge-conflict.ai.all-reset', resource.uri);
+    commandService.executeCommand(MERGE_CONFLICT_COMMANDS.ALL_RESET.id, resource.uri);
   }, [resource]);
 
   if (!isVisiable) {
@@ -85,50 +111,62 @@ export const MergeEditorFloatComponents: ReactEditorComponent<{ uri: URI }> = ({
 
   return (
     <div className={styles.merge_editor_float_container}>
-      <div id='merge.editor.action.button.accept'>
-        <Button className={styles.merge_conflict_bottom_btn} size='large' onClick={handlePrev}>
-          <Icon icon={'left'} />
-          <span>{localize('mergeEditor.conflict.prev')}</span>
-        </Button>
-        <Button className={styles.merge_conflict_bottom_btn} size='large' onClick={handleNext}>
-          <span>{localize('mergeEditor.conflict.next')}</span>
-          <Icon icon={'right'} />
-        </Button>
+      <div className={styles.merge_editor_float_container_info}>
+        {formatLocalize('merge-conflicts.merge.conflict.remain', conflicts.length)}
       </div>
-      <span className={styles.line_vertical}></span>
-      <Button
-        id='merge.editor.open.tradition'
-        className={styles.merge_conflict_bottom_btn}
-        size='large'
-        onClick={handleOpenMergeEditor}
-      >
-        <Icon icon={'swap'} />
-        <span>{localize('mergeEditor.open.3way')}</span>
-      </Button>
-      <Button id='merge.editor.rest' className={styles.merge_conflict_bottom_btn} size='large' onClick={handleReset}>
-        <Icon icon={'discard'} />
-        <span>{localize('mergeEditor.reset')}</span>
-      </Button>
-      {isSupportAiResolve() && (
+      <div className={styles.merge_editor_float_container_operation_bar}>
+        <div id='merge.editor.action.button.nav'>
+          <Button className={styles.merge_conflict_bottom_btn} size='default' onClick={handlePrev}>
+            <Icon icon={'left'} />
+            <span>{localize('mergeEditor.conflict.prev')}</span>
+          </Button>
+          <Button className={styles.merge_conflict_bottom_btn} size='default' onClick={handleNext}>
+            <span>{localize('mergeEditor.conflict.next')}</span>
+            <Icon icon={'right'} />
+          </Button>
+        </div>
+        <span className={styles.line_vertical}></span>
+        {inMergeChanges && (
+          <Button
+            id='merge.editor.open.tradition'
+            className={styles.merge_conflict_bottom_btn}
+            size='default'
+            onClick={handleOpenMergeEditor}
+          >
+            <Icon icon={'swap'} />
+            <span>{localize('mergeEditor.open.3way')}</span>
+          </Button>
+        )}
         <Button
-          id='merge.editor.conflict.resolve.all'
-          size='large'
-          className={`${styles.merge_conflict_bottom_btn} ${styles.magic_btn}`}
-          onClick={handleAIResolve}
+          id='merge.editor.rest'
+          className={styles.merge_conflict_bottom_btn}
+          size='default'
+          onClick={handleReset}
         >
-          {isAiResolving ? (
-            <>
-              <Icon icon={'circle-pause'} />
-              <span>{localize('mergeEditor.conflict.resolve.all.stop')}</span>
-            </>
-          ) : (
-            <>
-              <Icon icon={'magic-wand'} />
-              <span>{localize('mergeEditor.conflict.resolve.all')}</span>
-            </>
-          )}
+          <Icon icon={'discard'} />
+          <span>{localize('mergeEditor.reset')}</span>
         </Button>
-      )}
+        {isSupportAIResolve() && (
+          <Button
+            id='merge.editor.conflict.resolve.all'
+            size='default'
+            className={`${styles.merge_conflict_bottom_btn} ${styles.magic_btn}`}
+            onClick={handleAIResolve}
+          >
+            {isAIResolving ? (
+              <>
+                <Icon icon={'circle-pause'} />
+                <span>{localize('mergeEditor.conflict.ai.resolve.all.stop')}</span>
+              </>
+            ) : (
+              <>
+                <Icon icon={'magic-wand'} />
+                <span>{localize('mergeEditor.conflict.ai.resolve.all')}</span>
+              </>
+            )}
+          </Button>
+        )}
+      </div>
     </div>
   );
 };

package/src/browser/merge-editor/merge-editor.module.less

@@ -0,0 +1,71 @@
+.merge_editor_float_container {
+  display: flex;
+  flex-direction: column;
+  background: var(--kt-panelTab-activeBackground);
+  box-shadow: inset 1px 1px 3px 0px var(--kt-panelTab-border);
+  justify-content: space-between;
+  white-space: nowrap;
+  // minimap's z-index is 5
+  z-index: 6;
+  padding: 10px;
+
+  .merge_editor_float_container_info {
+    width: 100%;
+    display: flex;
+    padding-left: 20px;
+  }
+
+  .merge_editor_float_container_operation_bar {
+    width: 100%;
+    display: flex;
+    justify-content: flex-end;
+    white-space: nowrap;
+    padding-top: 4px;
+    padding-right: 20px;
+  }
+
+  .merge_conflict_bottom_btn {
+    border: 1px solid var(--kt-button-disableForeground);
+    border-radius: 8px;
+    padding: 5px 16px;
+    background: var(--editor-background);
+    color: var(--editor-foreground);
+    margin: 0 4px;
+    line-height: 22px;
+    justify-content: end;
+    white-space: nowrap;
+    cursor: pointer;
+    :global {
+      .kt-icon {
+        font-size: 12px;
+      }
+    }
+    :first-child {
+      margin-right: 8px;
+    }
+  }
+
+  .magic_btn {
+    background-image: radial-gradient(circle at -21% -22%, #19cfff, #8429ff);
+    border: none;
+    font-weight: 500;
+    span {
+      color: #fff;
+    }
+    :global {
+      .kt-icon {
+        color: #fff;
+        font-size: 12px;
+        margin-right: 8px;
+      }
+    }
+  }
+
+  .line_vertical {
+    background-color: var(--design-borderColor-common);
+    width: 1px;
+    min-width: 1px;
+    height: 24px;
+    margin: 4px;
+  }
+}

package/src/browser/merge-editor/merge-editor.provider.ts

@@ -22,6 +22,9 @@ export class MergeEditorResourceProvider extends WithEventBus implements IResour
       const resultEditorUri = new URI(output);
       const icon = this.labelService.getIcon(resultEditorUri);
       return {
+        // 如果设置为 true，再打开时没有找到对应的 provider 会报错
+        // TODO: 需要增加一个标记，说明这个资源要在某个插件加载后才能 revive
+        supportsRevive: false,
         name,
         icon,
         uri,

package/src/browser/tab.view.tsx

@@ -15,7 +15,6 @@ import React, {
 
 import { Scrollbars } from '@opensumi/ide-components';
 import {
-  AppConfig,
   ConfigContext,
   Disposable,
   DisposableCollection,
@@ -32,6 +31,7 @@ import {
   useDesignStyles,
 } from '@opensumi/ide-core-browser';
 import { InlineMenuBar } from '@opensumi/ide-core-browser/lib/components/actions';
+import { LayoutViewSizeConfig } from '@opensumi/ide-core-browser/lib/layout/constants';
 import { VIEW_CONTAINERS } from '@opensumi/ide-core-browser/lib/layout/view-id';
 import { IMenuRegistry, MenuId } from '@opensumi/ide-core-browser/lib/menu/next';
 import { useInjectable, useUpdateOnEventBusEvent } from '@opensumi/ide-core-browser/lib/react-hooks';
@@ -70,7 +70,7 @@ export const Tabs = ({ group }: ITabsProps) => {
   const preferenceService = useInjectable<PreferenceService>(PreferenceService);
   const menuRegistry = useInjectable<IMenuRegistry>(IMenuRegistry);
   const editorTabService = useInjectable<IEditorTabService>(IEditorTabService);
-  const appConfig = useInjectable<AppConfig>(AppConfig);
+  const layoutViewSize = useInjectable<LayoutViewSizeConfig>(LayoutViewSizeConfig);
 
   const styles_tab_right = useDesignStyles(styles.tab_right, 'tab_right');
   const styles_close_tab = useDesignStyles(styles.close_tab, 'close_tab');
@@ -415,8 +415,8 @@ export const Tabs = ({ group }: ITabsProps) => {
               })}
               style={
                 wrapMode && i === group.resources.length - 1
-                  ? { marginRight: lastMarginRight, height: appConfig.layoutViewSize!.editorTabsHeight }
-                  : { height: appConfig.layoutViewSize!.editorTabsHeight }
+                  ? { marginRight: lastMarginRight, height: layoutViewSize.editorTabsHeight }
+                  : { height: layoutViewSize.editorTabsHeight }
               }
               onContextMenu={(event) => {
                 tabTitleMenuService.show(event.nativeEvent.x, event.nativeEvent.y, resource && resource.uri, group);
@@ -529,7 +529,8 @@ export const EditorActions = forwardRef<HTMLDivElement, IEditorActionsProps>(
 
     const editorActionRegistry = useInjectable<IEditorActionRegistry>(IEditorActionRegistry);
     const editorService: WorkbenchEditorServiceImpl = useInjectable(WorkbenchEditorService);
-    const appConfig = useInjectable<AppConfig>(AppConfig);
+    const layoutViewSize = useInjectable<LayoutViewSizeConfig>(LayoutViewSizeConfig);
+
     const menu = editorActionRegistry.getMenu(group);
     const [hasFocus, setHasFocus] = useState<boolean>(editorService.currentEditorGroup === group);
     const [args, setArgs] = useState<[URI, IEditorGroup, MaybeNull<URI>] | undefined>(acquireArgs());
@@ -561,7 +562,7 @@ export const EditorActions = forwardRef<HTMLDivElement, IEditorActionsProps>(
       <div
         ref={ref}
         className={cls(styles_editor_actions, className)}
-        style={{ height: appConfig.layoutViewSize!.editorTabsHeight }}
+        style={{ height: layoutViewSize.editorTabsHeight }}
       >
         <InlineMenuBar<URI, IEditorGroup, MaybeNull<URI>>
           menus={menu}

package/src/browser/types.ts

@@ -275,6 +275,14 @@ export interface IThemedCssStyle extends IDisposable {
   overviewRulerColor?: string | IThemeColor;
 }
 
+export interface IThemedCssStyleCollection {
+  default: IThemedCssStyle;
+  light: IThemedCssStyle | null;
+  dark: IThemedCssStyle | null;
+
+  dispose(): void;
+}
+
 export const IEditorDecorationCollectionService = Symbol('IEditorDecorationCollectionService');
 
 export class EditorSelectionChangeEvent extends BasicEvent<IEditorSelectionChangeEventPayload> {}

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

@@ -2061,7 +2061,7 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
   }
 
   /**
-   * 当前打开的resource
+   * current opened resource
    */
   get currentResource(): MaybeNull<IResource> {
     return this._currentResource;

package/src/common/editor.ts

@@ -149,7 +149,7 @@ export enum EditorType {
 }
 
 /**
- * 一个IEditor代表了一个最小的编辑器单元，可以是CodeEditor中的一个，也可以是DiffEditor中的两个
+ * 一个IEditor代表了一个最小的编辑器单元，可以是 CodeEditor 中的一个，也可以是 DiffEditor 中的两个
  */
 export interface IEditor {
   /**
@@ -567,6 +567,8 @@ export interface IResourceOpenOptions {
 
   /**
    * @deprecated use focus instead
+   *
+   * An optional flag that when `true` will stop the editor from taking focus.
    */
   preserveFocus?: boolean;