@opensumi/ide-editor 2.27.3-next-1710834527.0 → 2.27.3-next-1710917566.0

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

@@ -1,11 +1,14 @@
-import React, { useCallback } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 
-import { Button } from '@opensumi/ide-components';
+import { Button, Icon } from '@opensumi/ide-components';
 import {
+  AINativeConfigService,
   CommandRegistry,
   CommandService,
+  IContextKeyService,
   SCM_COMMANDS,
   URI,
+  Uri,
   localize,
   useInjectable,
 } from '@opensumi/ide-core-browser';
@@ -14,9 +17,31 @@ import styles from '../editor.module.less';
 import { ReactEditorComponent } from '../types';
 
 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 [isVisiable, setIsVisiable] = useState(false);
+
+  const gitMergeChangesSet = new Set(['git.mergeChanges']);
+
+  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 [isAiResolving, setIsAiResolving] = useState(false);
   const handleOpenMergeEditor = useCallback(async () => {
     const { uri } = resource;
 
@@ -27,11 +52,83 @@ export const MergeEditorFloatComponents: ReactEditorComponent<{ uri: URI }> = ({
     });
   }, [resource]);
 
+  const isSupportAiResolve = useCallback(
+    () => aiNativeConfigService.capabilities.supportsConflictResolve,
+    [aiNativeConfigService],
+  );
+
+  const handlePrev = () => {
+    commandService.tryExecuteCommand('merge-conflict.previous');
+  };
+
+  const handleNext = () => {
+    commandService.tryExecuteCommand('merge-conflict.next');
+  };
+
+  const handleAIResolve = useCallback(async () => {
+    setIsAiResolving(true);
+    if (isAiResolving) {
+      await commandService.executeCommand('merge-conflict.ai.all-accept-stop', resource.uri);
+    } else {
+      await commandService.executeCommand('merge-conflict.ai.all-accept', resource.uri);
+    }
+    setIsAiResolving(false);
+  }, [resource, isAiResolving]);
+
+  const handleReset = useCallback(() => {
+    commandService.executeCommand('merge-conflict.ai.all-reset', resource.uri);
+  }, [resource]);
+
+  if (!isVisiable) {
+    return null;
+  }
+
   return (
     <div className={styles.merge_editor_float_container}>
-      <Button size='large' onClick={handleOpenMergeEditor}>
-        {localize('mergeEditor.open.in.editor')}
+      <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>
+      <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() && (
+        <Button
+          id='merge.editor.conflict.resolve.all'
+          size='large'
+          className={`${styles.merge_conflict_bottom_btn} ${styles.magic_btn}`}
+          onClick={handleAIResolve}
+        >
+          {isAiResolving ? (
+            <>
+              <Icon icon={'circle-pause'} />
+              <span>{localize('mergeEditor.conflict.resolve.all.stop')}</span>
+            </>
+          ) : (
+            <>
+              <Icon icon={'magic-wand'} />
+              <span>{localize('mergeEditor.conflict.resolve.all')}</span>
+            </>
+          )}
+        </Button>
+      )}
     </div>
   );
 };

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

@@ -1,5 +1,5 @@
 import { Autowired } from '@opensumi/di';
-import { Disposable, Domain, IContextKeyService, Schemes, Uri } from '@opensumi/ide-core-browser';
+import { Disposable, Domain, Schemes } from '@opensumi/ide-core-browser';
 
 import { ResourceService } from '../../common';
 import { BrowserEditorContribution, EditorComponentRegistry, EditorOpenType } from '../types';
@@ -14,9 +14,6 @@ export class MergeEditorContribution extends Disposable implements BrowserEditor
   @Autowired()
   private readonly mergeEditorResourceProvider: MergeEditorResourceProvider;
 
-  @Autowired(IContextKeyService)
-  private readonly contextKeyService: IContextKeyService;
-
   registerResource(resourceService: ResourceService): void {
     resourceService.registerResourceProvider(this.mergeEditorResourceProvider);
   }
@@ -30,15 +27,14 @@ export class MergeEditorContribution extends Disposable implements BrowserEditor
 
     registry.registerEditorSideWidget({
       id: MERGE_EDITOR_FLOATING_WIDGET,
-      component: MergeEditorFloatComponents as any,
+      component: MergeEditorFloatComponents,
       displaysOnResource: (resource) => {
         const { uri } = resource;
         if (uri.scheme !== Schemes.file) {
           return false;
         }
-
-        const mergeChanges = this.contextKeyService.getValue<Uri[]>('git.mergeChanges') || [];
-        return mergeChanges.some((value) => value.toString() === uri.toString());
+        // 由于存在时序问题，具体是否显示的逻辑由组件内部处理
+        return true;
       },
     });
   }

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

@@ -1503,6 +1503,8 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
       const query = uri.getParsedQuery();
       this.doDisposeDocRef(new URI(query.original));
       this.doDisposeDocRef(new URI(query.modified));
+    } else if (uri.scheme === 'mergeEditor') {
+      this.mergeEditor.dispose();
     } else {
       this.doDisposeDocRef(uri);
     }