@opensumi/ide-editor 2.27.3-next-1711507853.0 → 2.27.3-next-1711612363.0

package/src/browser/doc-model/editor-document-model.ts

@@ -4,6 +4,7 @@ import { Autowired, Injectable } from '@opensumi/di';
 import {
   CommandService,
   Disposable,
+  EDITOR_COMMANDS,
   Emitter,
   IEventBus,
   ILogger,
@@ -686,7 +687,7 @@ export class EditorDocumentModel extends Disposable implements IEditorDocumentMo
               reject(err);
             }, formatOnSaveTimeout);
           }),
-          this.commandService.executeCommand('editor.action.formatDocument'),
+          this.commandService.executeCommand(EDITOR_COMMANDS.FORMAT_DOCUMENT.id),
         ]);
       } catch (err) {
         if (err.name === 'FormatOnSaveTimeoutError') {

package/src/browser/doc-model/override.ts

@@ -1,11 +1,11 @@
 /* istanbul ignore file */
 import { Autowired, Injectable } from '@opensumi/di';
 import { URI } from '@opensumi/ide-core-browser';
+import * as monaco from '@opensumi/ide-monaco';
 import {
   ITextModelContentProvider,
   ITextModelService,
 } from '@opensumi/monaco-editor-core/esm/vs/editor/common/services/resolverService';
-import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
 
 import { IEditorDocumentModelService } from './types';
 

package/src/browser/doc-model/saveParticipants.ts

@@ -15,6 +15,7 @@ import {
   formatLocalize,
 } from '@opensumi/ide-core-browser';
 import { IProgressService } from '@opensumi/ide-core-browser/lib/progress';
+import * as monaco from '@opensumi/ide-monaco';
 import { ResourceEdit } from '@opensumi/ide-monaco/lib/browser/monaco-api';
 import { languageFeaturesService } from '@opensumi/ide-monaco/lib/browser/monaco-api/languages';
 import { ITextModel } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
@@ -25,15 +26,12 @@ import { EditOperation } from '@opensumi/monaco-editor-core/esm/vs/editor/common
 import { Range } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/range';
 import * as languages from '@opensumi/monaco-editor-core/esm/vs/editor/common/languages';
 import { CodeActionProvider } from '@opensumi/monaco-editor-core/esm/vs/editor/common/languages';
+import { getCodeActions } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/codeAction/browser/codeAction';
 import {
   CodeActionItem,
-  getCodeActions,
-} from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/codeAction/browser/codeAction';
-import {
   CodeActionKind,
   CodeActionTriggerSource,
-} from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/codeAction/browser/types';
-import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
+} from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/codeAction/common/types';
 
 import { MonacoCodeService } from '../editor.override';
 import { SaveReason } from '../types';

package/src/browser/doc-model/types.ts

@@ -8,8 +8,8 @@ import {
   MaybePromise,
   URI,
 } from '@opensumi/ide-core-browser';
+import * as monaco from '@opensumi/ide-monaco';
 import { EOL, EndOfLineSequence } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
-import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
 
 import { IEditorDocumentModelContentChange, SaveReason } from '../../common';
 import { IEditorDocumentModel, IEditorDocumentModelRef } from '../../common/editor';

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

@@ -1,5 +1,5 @@
 import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
-import { IContextKeyService, IRange } from '@opensumi/ide-core-browser';
+import { IContextKeyService, IRange, PreferenceService } from '@opensumi/ide-core-browser';
 import { ResourceContextKey } from '@opensumi/ide-core-browser/lib/contextkey';
 import { MonacoService } from '@opensumi/ide-core-browser/lib/monaco';
 import {
@@ -14,7 +14,7 @@ import {
   isEmptyObject,
   objects,
 } from '@opensumi/ide-core-common';
-import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
+import * as monaco from '@opensumi/ide-monaco';
 import { IConfigurationService } from '@opensumi/monaco-editor-core/esm/vs/platform/configuration/common/configuration';
 
 import {
@@ -283,7 +283,7 @@ export abstract class BaseMonacoEditorWrapper extends WithEventBus implements IE
     );
     this.addDispose(
       this.configurationService.onDidChangeConfiguration((e) => {
-        const changedEditorKeys = e.affectedKeys.filter((key) => isEditorOption(key));
+        const changedEditorKeys = Array.from(e.affectedKeys.values()).filter((key) => isEditorOption(key));
         if (changedEditorKeys.length > 0) {
           this._doUpdateOptions();
         }
@@ -585,6 +585,9 @@ export class BrowserDiffEditor extends WithEventBus implements IDiffEditor {
   @Autowired(IConfigurationService)
   protected readonly configurationService: IConfigurationService;
 
+  @Autowired(PreferenceService)
+  protected readonly preferenceService: PreferenceService;
+
   @Autowired(IContextKeyService)
   protected readonly contextKeyService: IContextKeyService;
 
@@ -617,7 +620,7 @@ export class BrowserDiffEditor extends WithEventBus implements IDiffEditor {
     this.wrapEditors();
     this.addDispose(
       this.configurationService.onDidChangeConfiguration((e) => {
-        const changedEditorKeys = e.affectedKeys.filter((key) => isDiffEditorOption(key));
+        const changedEditorKeys = Array.from(e.affectedKeys.values()).filter((key) => isDiffEditorOption(key));
         if (changedEditorKeys.length > 0) {
           this.doUpdateDiffOptions();
         }
@@ -678,8 +681,9 @@ export class BrowserDiffEditor extends WithEventBus implements IDiffEditor {
     } else {
       this.restoreState();
     }
-
-    if (options.revealFirstDiff) {
+    const enableHideUnchanged = this.preferenceService.get('diffEditor.hideUnchangedRegions.enabled');
+    if (options.revealFirstDiff && !enableHideUnchanged) {
+      // 仅在非折叠模式下自动滚动到第一个 Diff
       const diffs = this.monacoDiffEditor.getLineChanges();
       if (diffs && diffs.length > 0) {
         this.showFirstDiff();

package/src/browser/editor.contribution.ts

@@ -16,6 +16,7 @@ import {
   IEventBus,
   IOpenerService,
   IPreferenceSettingsService,
+  IQuickInputService,
   IQuickOpenHandlerRegistry,
   KeybindingContribution,
   KeybindingRegistry,
@@ -45,8 +46,8 @@ import { ILogger, PreferenceScope, isWindows } from '@opensumi/ide-core-common';
 import { MergeEditorService } from '@opensumi/ide-monaco/lib/browser/contrib/merge-editor/merge-editor.service';
 import { ITextmateTokenizer, ITextmateTokenizerService } from '@opensumi/ide-monaco/lib/browser/contrib/tokenizer';
 import { EOL } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
+import * as monaco from '@opensumi/ide-monaco/lib/common/common';
 import { EditorContextKeys } from '@opensumi/monaco-editor-core/esm/vs/editor/common/editorContextKeys';
-import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
 import { ContextKeyExpr } from '@opensumi/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey';
 import { SyncDescriptor } from '@opensumi/monaco-editor-core/esm/vs/platform/instantiation/common/descriptors';
 
@@ -172,6 +173,12 @@ export class EditorContribution
   @Autowired(IEditorDocumentModelContentRegistry)
   contentRegistry: IEditorDocumentModelContentRegistry;
 
+  @Autowired(IQuickInputService)
+  private readonly quickInputService: IQuickInputService;
+
+  @Autowired(CommandService)
+  private readonly commandService: CommandService;
+
   registerComponent(registry: ComponentRegistry) {
     registry.register('@opensumi/ide-editor', {
       id: 'ide-editor',
@@ -502,6 +509,35 @@ export class EditorContribution
       },
     });
 
+    commands.registerCommand(EDITOR_COMMANDS.OPEN_MERGEEDITOR_DEV, {
+      execute: async () => {
+        try {
+          const value = await this.quickInputService.open({ value: '' });
+          if (!value) {
+            return;
+          }
+
+          const toArgs = JSON.parse(value);
+
+          /**
+           * @example
+           * {
+           *   input1: {
+           *     uri: 'current 分支的 uri'
+           *   },
+           *   input2: {
+           *     uri: 'incoming 分支的 uri'
+           *   },
+           *   output: '中间视图的文件 uri',
+           *   base: '共同祖先分支的文件 uri'
+           * }
+           */
+
+          this.commandService.executeCommand(EDITOR_COMMANDS.OPEN_MERGEEDITOR.id, toArgs);
+        } catch (error) {}
+      },
+    });
+
     commands.registerCommand(EDITOR_COMMANDS.OPEN_MERGEEDITOR, {
       execute: (args: unknown) => {
         const validatedArgs = IRelaxedOpenMergeEditorArgs.validate(args);

package/src/browser/editor.decoration.service.ts

@@ -1,8 +1,8 @@
 import { Autowired, Injectable } from '@opensumi/di';
 import { Disposable, IDisposable, IEventBus, URI } from '@opensumi/ide-core-browser';
+import * as monaco from '@opensumi/ide-monaco';
 import { IIconService, IThemeService } from '@opensumi/ide-theme';
 import { ICSSStyleService } from '@opensumi/ide-theme/lib/common/style';
-import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
 
 import { IContentDecorationRenderOptions, IDecorationRenderOptions, IThemeDecorationRenderOptions } from '../common';
 

package/src/browser/editor.module.less

@@ -571,8 +571,54 @@
 
 // -------------- styles for merge editor component starts --------------
 .merge_editor_float_container {
-  position: absolute;
-  right: 50px;
-  bottom: 30px;
+  display: flex;
+  background: var(--kt-panelTab-activeBackground);
+  box-shadow: inset 1px 1px 3px 0px var(--kt-panelTab-border);
+  padding: 16px 28px;
+  justify-content: end;
+  white-space: nowrap;
+  .merge_conflict_bottom_btn {
+    border: 1px solid var(--kt-button-disableForeground);
+    border-radius: 8px;
+    padding: 5px 16px;
+    background: var(--editor-background);
+    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-border-color-common);
+    width: 1px;
+    min-width: 1px;
+    height: 24px;
+    margin: 4px;
+  }
 }
 // -------------- styles for merge editor component ends --------------

package/src/browser/editor.override.ts

@@ -1,13 +1,15 @@
 import { Autowired, Injectable } from '@opensumi/di';
 import { PreferenceService } from '@opensumi/ide-core-browser';
 import { IRange, URI } from '@opensumi/ide-core-common';
+import * as monaco from '@opensumi/ide-monaco';
+import { isEqual } from '@opensumi/monaco-editor-core/esm/vs/base/common/resources';
 import { AbstractCodeEditorService } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/services/abstractCodeEditorService';
 import { ICodeEditorService } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService';
-import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
 import { EditorScopedLayoutService } from '@opensumi/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneLayoutService';
 import { StandaloneServices } from '@opensumi/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
 import { IStandaloneThemeService } from '@opensumi/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme';
 import { ContextViewService } from '@opensumi/monaco-editor-core/esm/vs/platform/contextview/browser/contextViewService';
+import { IResourceEditorInput } from '@opensumi/monaco-editor-core/esm/vs/platform/editor/common/editor';
 
 /* istanbul ignore file */
 import { EditorOpenType, WorkbenchEditorService } from '../common';
@@ -44,22 +46,17 @@ export class MonacoCodeService extends AbstractCodeEditorService {
    * @param sideBySide ？
    */
   async openCodeEditor(
-    // @ts-ignore
-    input: monaco.editor.IResourceInput,
+    input: IResourceEditorInput,
     source: IMonacoCodeEditor | null,
     sideBySide?: boolean,
   ): Promise<IMonacoCodeEditor | null> {
-    const resourceUri = new URI(input.resource.toString());
+    const resourceUri = input.resource;
     // 判断打开下一个不同于当前编辑器的文件时，是否需要先固定当前编辑器Tab，从而避免被替换，例如：跳转到定义
     const enablePreviewFromCodeNavigation = this.preferenceService.get<boolean>(
       'editor.enablePreviewFromCodeNavigation',
     );
-    if (
-      !enablePreviewFromCodeNavigation &&
-      source &&
-      !sideBySide &&
-      !new URI(source.getModel()?.uri).isEqual(input.resource)
-    ) {
+
+    if (!enablePreviewFromCodeNavigation && source && !sideBySide && isEqual(source.getModel()?.uri, input.resource)) {
       for (const visibleGroup of this.workbenchEditorService.editorGroups) {
         if (visibleGroup.currentOpenType?.type === EditorOpenType.code) {
           if (visibleGroup.currentEditor?.monacoEditor === source) {
@@ -91,6 +88,7 @@ export class MonacoCodeService extends AbstractCodeEditorService {
         index++;
       }
     }
+    // @ts-ignore
     const selection = input.options ? input.options.selection : null;
     let range;
     if (selection) {
@@ -105,13 +103,12 @@ export class MonacoCodeService extends AbstractCodeEditorService {
         );
       }
     }
-    await editorGroup.open(resourceUri, { index, range: range as IRange, focus: true });
+    const openUri = URI.parse(resourceUri.toString());
+    await editorGroup.open(openUri, { index, range: range as IRange, focus: true });
     return (editorGroup.codeEditor as BrowserCodeEditor).monacoEditor;
   }
 }
 
-// @ts-ignore
-
 export class MonacoContextViewService extends ContextViewService {
   private menuContainer: HTMLDivElement;
 

package/src/browser/format/formatterSelect.ts

@@ -1,8 +1,8 @@
 import { Autowired, Injectable } from '@opensumi/di';
 import { PreferenceScope, PreferenceService, QuickPickService, URI, localize } from '@opensumi/ide-core-browser';
+import * as monaco from '@opensumi/ide-monaco';
 import { ITextModel } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
 import { FormattingMode } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/format/browser/format';
-import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
 
 import { IEditorDocumentModelService } from '../doc-model/types';
 
@@ -45,7 +45,7 @@ export class FormattingSelector {
     const elements: { [key: string]: IProvider } = {};
     formatters.forEach((provider: IProvider) => {
       if (provider.extensionId) {
-        elements[provider.extensionId] = provider;
+        elements[provider.extensionId as any] = provider;
       }
     });
 
@@ -73,7 +73,7 @@ export class FormattingSelector {
           { ...config, [languageId]: selected },
           PreferenceScope.User,
         );
-        return elements[selected];
+        return elements[selected as any];
       }
     } else {
       return undefined;

package/src/browser/language/diagnostic-collection.ts

@@ -1,14 +1,12 @@
-import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
-
-import IMonacoModel = monaco.editor.IModel;
-import IMonacoMarkerData = monaco.editor.IMarkerData;
-
-// eslint-disable-next-line import/order
 import { Disposable, DisposableCollection, IDisposable } from '@opensumi/ide-core-common';
+import * as monaco from '@opensumi/ide-monaco';
+import { monacoApi } from '@opensumi/ide-monaco/lib/browser/monaco-api';
 
-// eslint-disable-next-line import/order
 import { Diagnostic, DiagnosticCollection, asMonacoDiagnostics } from '../../common';
 
+type IMonacoModel = monaco.editor.ITextModel;
+type IMonacoMarkerData = monaco.editor.IMarkerData;
+
 export class MonacoDiagnosticCollection implements DiagnosticCollection {
   protected readonly diagnostics = new Map<string, MonacoModelDiagnostics | undefined>();
   protected readonly toDispose = new DisposableCollection();
@@ -48,7 +46,7 @@ export class MonacoModelDiagnostics implements IDisposable {
   constructor(uri: string, diagnostics: Diagnostic[], readonly owner: string) {
     this.uri = monaco.Uri.parse(uri);
     this.diagnostics = diagnostics;
-    monaco.editor.onDidCreateModel((model) => this.doUpdateModelMarkers(model));
+    monacoApi.editor.onDidCreateModel((model) => this.doUpdateModelMarkers(model));
   }
 
   set diagnostics(diagnostics: Diagnostic[]) {
@@ -71,13 +69,13 @@ export class MonacoModelDiagnostics implements IDisposable {
   }
 
   updateModelMarkers(): void {
-    const model = monaco.editor.getModel(this.uri);
+    const model = monacoApi.editor.getModel(this.uri);
     this.doUpdateModelMarkers(model);
   }
 
   protected doUpdateModelMarkers(model: IMonacoModel | null): void {
     if (model && this.uri.toString() === model.uri.toString()) {
-      monaco.editor.setModelMarkers(model, this.owner, this._markers);
+      monacoApi.editor.setModelMarkers(model, this.owner, this._markers);
     }
   }
 }

package/src/browser/language/language.service.ts

@@ -8,8 +8,8 @@ import {
   MarkerSeverity,
   URI,
 } from '@opensumi/ide-core-common';
+import * as monaco from '@opensumi/ide-monaco';
 import { ITextmateTokenizer, ITextmateTokenizerService } from '@opensumi/ide-monaco/lib/browser/contrib/tokenizer';
-import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
 
 import {
   Diagnostic,

package/src/browser/menu/editor.context.ts

@@ -1,5 +1,6 @@
 import { Disposable, IContextKeyService } from '@opensumi/ide-core-browser';
 import { AbstractContextMenuService, ICtxMenuRenderer, MenuId } from '@opensumi/ide-core-browser/lib/menu/next';
+import * as monaco from '@opensumi/ide-monaco';
 import { ICodeEditor } from '@opensumi/ide-monaco/lib/common/types';
 import * as dom from '@opensumi/monaco-editor-core/esm/vs/base/browser/dom';
 import { IAnchor } from '@opensumi/monaco-editor-core/esm/vs/base/browser/ui/contextview/contextview';
@@ -8,7 +9,6 @@ import { IEditorMouseEvent, MouseTargetType } from '@opensumi/monaco-editor-core
 import { EditorOption } from '@opensumi/monaco-editor-core/esm/vs/editor/common/config/editorOptions';
 import { IEditorContribution } from '@opensumi/monaco-editor-core/esm/vs/editor/common/editorCommon';
 import { ContextMenuController } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/contextmenu/browser/contextmenu';
-import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
 
 export class EditorContextMenuController extends Disposable implements IEditorContribution {
   public static readonly ID = 'editor.contrib.contextmenu';

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/monaco-contrib/callHierarchy/callHierarchy.service.ts

@@ -17,13 +17,12 @@ import {
   IncomingCall,
   OutgoingCall,
 } from '@opensumi/ide-monaco/lib/browser/contrib/callHierarchy';
-import { ITextModel, Position } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
+import { ITextModel, Position, ProviderResult } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
 
 import { IEditorDocumentModelService } from '../../doc-model/types';
 
 const { isNonEmptyArray } = arrays;
 
-declare type ProviderResult<T> = T | undefined | null | Thenable<T | undefined | null>;
 /* ---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.

package/src/browser/monaco-contrib/command/command.service.ts

@@ -205,7 +205,7 @@ export class MonacoCommandRegistry implements IMonacoCommandsRegistry {
    * 获取当前活动的编辑器
    * 此处的活动编辑器和 workbenchEditorService.currentEditor 的概念不同，对于diffEditor，需要获取确实的那个editor而不是modifiedEditor
    */
-  protected getActiveCodeEditor(): ICodeEditor | undefined {
+  public getActiveCodeEditor(): ICodeEditor | undefined {
     // 先从 monaco 内部获取到当前 focus 的 editor
     const editor = this.codeEditorService?.getFocusedCodeEditor();
     if (editor) {
@@ -290,7 +290,7 @@ export class MonacoActionRegistry implements IMonacoActionRegistry {
 
   registerMonacoActions() {
     const editorActions = new Map(
-      this.monacoEditorRegistry.getEditorActions().map(({ id, label, alias }) => [
+      Array.from(this.monacoEditorRegistry.getEditorActions()).map(({ id, label, alias }) => [
         id,
         {
           label,

package/src/browser/monaco-contrib/tokenizer/textmate-tokenizer.ts

@@ -1,11 +1,11 @@
 import { IGrammar, INITIAL, StackElement } from 'vscode-textmate';
 
 import { Disposable, Emitter, Event } from '@opensumi/ide-core-common/lib/utils';
+import * as monaco from '@opensumi/ide-monaco';
 import {
   MetadataConsts,
   TokenMetadata,
 } from '@opensumi/monaco-editor-core/esm/vs/editor/common/encodedTokenAttributes';
-import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
 
 export class TokenizerState implements monaco.languages.IState {
   constructor(public readonly ruleStack: StackElement) {}