@opensumi/ide-editor 2.27.3-rc-1710489030.0 → 2.27.3-rc-1711022312.0

package/src/browser/diff/compare.ts

@@ -3,9 +3,11 @@ import {
   CommandContribution,
   CommandRegistry,
   CommandService,
+  DIFF_EDITOR_COMMANDS,
   Deferred,
   Domain,
   EDITOR_COMMANDS,
+  PreferenceService,
   URI,
   getIcon,
   localize,
@@ -47,13 +49,16 @@ export class CompareService implements ICompareService {
 @Domain(MenuContribution, CommandContribution)
 export class CompareEditorContribution implements MenuContribution, CommandContribution {
   @Autowired(ICompareService)
-  compareService: CompareService;
+  private compareService: CompareService;
+
+  @Autowired(PreferenceService)
+  private preferenceService: PreferenceService;
 
   registerMenus(menu: IMenuRegistry) {
     menu.registerMenuItems(MenuId.EditorTitle, [
       {
         command: {
-          id: 'editor.diff.accept',
+          id: DIFF_EDITOR_COMMANDS.ACCEPT.id,
           label: localize('editor.action.accept'),
         },
         iconClass: getIcon('check'),
@@ -64,7 +69,7 @@ export class CompareEditorContribution implements MenuContribution, CommandContr
     menu.registerMenuItems(MenuId.EditorTitle, [
       {
         command: {
-          id: 'editor.diff.revert',
+          id: DIFF_EDITOR_COMMANDS.REVERT.id,
           label: localize('editor.action.revert'),
         },
         iconClass: getIcon('rollback'),
@@ -72,28 +77,40 @@ export class CompareEditorContribution implements MenuContribution, CommandContr
         when: 'isInDiffEditor && diffResource =~ /%26comparing%3Dtrue$/',
       },
     ]);
+    menu.registerMenuItems(MenuId.EditorTitle, [
+      {
+        command: {
+          id: DIFF_EDITOR_COMMANDS.TOGGLE_COLLAPSE_UNCHANGED_REGIONS.id,
+          label: localize('diffEditor.action.toggleCollapseUnchangedRegions'),
+        },
+        toggledWhen: 'config.diffEditor.hideUnchangedRegions.enabled',
+        iconClass: 'codicon codicon-map',
+        group: 'navigation',
+        when: 'isInDiffEditor',
+      },
+    ]);
   }
 
   registerCommands(commands: CommandRegistry) {
-    commands.registerCommand(
-      { id: 'editor.diff.accept' },
-      {
-        execute: (uri: URI) => {
-          if (uri && this.compareService.comparing.has(uri.toString())) {
-            this.compareService.comparing.get(uri.toString())!.resolve(CompareResult.accept);
-          }
-        },
+    commands.registerCommand(DIFF_EDITOR_COMMANDS.ACCEPT, {
+      execute: (uri: URI) => {
+        if (uri && this.compareService.comparing.has(uri.toString())) {
+          this.compareService.comparing.get(uri.toString())!.resolve(CompareResult.accept);
+        }
       },
-    );
-    commands.registerCommand(
-      { id: 'editor.diff.revert' },
-      {
-        execute: (uri: URI) => {
-          if (uri && this.compareService.comparing.has(uri.toString())) {
-            this.compareService.comparing.get(uri.toString())!.resolve(CompareResult.revert);
-          }
-        },
+    });
+    commands.registerCommand(DIFF_EDITOR_COMMANDS.REVERT, {
+      execute: (uri: URI) => {
+        if (uri && this.compareService.comparing.has(uri.toString())) {
+          this.compareService.comparing.get(uri.toString())!.resolve(CompareResult.revert);
+        }
+      },
+    });
+    commands.registerCommand(DIFF_EDITOR_COMMANDS.TOGGLE_COLLAPSE_UNCHANGED_REGIONS, {
+      execute: () => {
+        const enabled = this.preferenceService.get('diffEditor.hideUnchangedRegions.enabled');
+        this.preferenceService.set('diffEditor.hideUnchangedRegions.enabled', !enabled);
       },
-    );
+    });
   }
 }

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/editor.contribution.ts

@@ -16,6 +16,7 @@ import {
   IEventBus,
   IOpenerService,
   IPreferenceSettingsService,
+  IQuickInputService,
   IQuickOpenHandlerRegistry,
   KeybindingContribution,
   KeybindingRegistry,
@@ -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.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/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/preference/converter.ts

@@ -42,7 +42,14 @@ export function getConvertedMonacoOptions(
       editorOptions[key] = value;
     } else {
       const converter: IMonacoOptionsConverter = editorOptionsConverters.get(key)! as IMonacoOptionsConverter;
-      editorOptions[converter.monaco] = converter.convert ? converter.convert(value) : value;
+      if (!editorOptions[converter.monaco]) {
+        editorOptions[converter.monaco] = converter.convert ? converter.convert(value) : value;
+      } else {
+        editorOptions[converter.monaco] = {
+          ...editorOptions[converter.monaco],
+          ...(converter.convert ? converter.convert(value) : value),
+        };
+      }
     }
   });
 
@@ -74,7 +81,14 @@ export function getConvertedMonacoOptions(
       editorOptions[key] = value;
     } else {
       const converter: IMonacoOptionsConverter = diffEditorOptionsConverters.get(key)! as IMonacoOptionsConverter;
-      diffOptions[converter.monaco] = converter.convert ? converter.convert(value) : value;
+      if (diffOptions[converter.monaco]) {
+        diffOptions[converter.monaco] = {
+          ...diffOptions[converter.monaco],
+          ...(converter.convert ? converter.convert(value) : value),
+        };
+      } else {
+        diffOptions[converter.monaco] = converter.convert ? converter.convert(value) : value;
+      }
     }
   });
 
@@ -786,7 +800,6 @@ export const diffEditorOptionsConverters: Map<KaitianPreferenceKey, NoConverter
    * Defaults to false.
    */
   ['diffEditor.originalEditable', { monaco: 'originalEditable' }],
-
   [
     'diffEditor.minimap',
     {
@@ -796,6 +809,46 @@ export const diffEditorOptionsConverters: Map<KaitianPreferenceKey, NoConverter
       }),
     },
   ],
+
+  /**
+   * Controls whether the diff editor shows unchanged regions.
+   */
+  [
+    'diffEditor.hideUnchangedRegions.enabled',
+    { monaco: 'hideUnchangedRegions', convert: (value) => ({ enabled: value }) },
+  ],
+  /**
+   * Controls how many lines are used for unchanged regions.
+   */
+  [
+    'diffEditor.hideUnchangedRegions.revealLineCount',
+    { monaco: 'hideUnchangedRegions', convert: (value) => ({ revealLineCount: value }) },
+  ],
+  /**
+   * Controls how many lines are used as a minimum for unchanged regions.
+   */
+  [
+    'diffEditor.hideUnchangedRegions.minimumLineCount',
+    { monaco: 'hideUnchangedRegions', convert: (value) => ({ minimumLineCount: value }) },
+  ],
+  /**
+   * Controls how many lines are used as context when comparing unchanged regions.
+   */
+  [
+    'diffEditor.hideUnchangedRegions.contextLineCount',
+    { monaco: 'hideUnchangedRegions', convert: (value) => ({ contextLineCount: value }) },
+  ],
+  /**
+   * Controls whether the diff editor should show detected code moves.
+   */
+  ['diffEditor.experimental.showMoves', { monaco: 'experimental', convert: (value) => ({ showMoves: value }) }],
+  /**
+   * Controls whether the diff editor shows empty decorations to see where characters got inserted or deleted.
+   */
+  [
+    'diffEditor.experimental.showEmptyDecorations',
+    { monaco: 'experimental', convert: (value) => ({ showEmptyDecorations: value }) },
+  ],
 ]);
 
 function isContainOptionKey(key: string, optionMap: Map<KaitianPreferenceKey, NoConverter | IMonacoOptionsConverter>) {

package/src/browser/preference/schema.ts

@@ -137,7 +137,7 @@ export const EDITOR_DEFAULTS = {
     extraEditorClassName: '',
     disableMonospaceOptimizations: false,
     rulers: [],
-    ariaLabel: localize('editorViewAccessibleLabel', 'Editor content'),
+    ariaLabel: localize('editorViewAccessibleLabel', 'Editor Content'),
     renderLineNumbers: 0,
     renderCustomLineNumbers: null,
     renderFinalNewline: true,
@@ -239,6 +239,24 @@ export const EDITOR_DEFAULTS = {
   },
 };
 
+export const DIFF_EDITOR_DEFAULTS = {
+  renderIndicators: true,
+  minimap: false,
+  renderSideBySide: true,
+  ignoreTrimWhitespace: false,
+  hideUnchangedRegions: {
+    enabled: true,
+    revealLineCount: 20,
+    minimumLineCount: 3,
+    contextLineCount: 3,
+  },
+  experimental: {
+    showMoves: false,
+    showEmptyDecorations: true,
+    collapseUnchangedRegions: true,
+  },
+};
+
 const monacoEditorSchema: PreferenceSchemaProperties = {
   'editor.ariaLabel': {
     type: 'string',
@@ -1412,15 +1430,6 @@ const monacoEditorSchema: PreferenceSchemaProperties = {
     default: EDITOR_MODEL_DEFAULTS.largeFileOptimizations,
     description: '%editor.configuration.largeFileOptimizations%',
   },
-  'diffEditor.renderIndicators': {
-    type: 'boolean',
-    default: true,
-    description: '%editor.configuration.renderIndicators%',
-  },
-  'diffEditor.minimap': {
-    type: 'boolean',
-    default: false,
-  },
   'editor.defaultFormatter': {
     type: 'string',
     description: '%editor.configuration.defaultFormatter%',
@@ -1430,6 +1439,15 @@ const monacoEditorSchema: PreferenceSchemaProperties = {
     default: true,
     description: '%editor.configuration.unicodeHighlight.ambiguousCharacters%',
   },
+  'diffEditor.renderIndicators': {
+    type: 'boolean',
+    default: DIFF_EDITOR_DEFAULTS.renderIndicators,
+    description: '%editor.configuration.renderIndicators%',
+  },
+  'diffEditor.minimap': {
+    type: 'boolean',
+    default: DIFF_EDITOR_DEFAULTS.minimap,
+  },
 };
 
 const customEditorSchema: PreferenceSchemaProperties = {
@@ -1622,25 +1640,64 @@ const customEditorSchema: PreferenceSchemaProperties = {
       type: 'string',
     },
   },
-  'diffEditor.renderSideBySide': {
+  'editor.experimental.stickyScroll.enabled': {
+    type: 'boolean',
+    default: false,
+    description: '%editor.configuration.experimental.stickyScroll.enabled%',
+  },
+  'editor.mouseBackForwardToNavigate': {
     type: 'boolean',
     default: true,
+    description: '%editor.configuration.mouseBackForwardToNavigate%',
+  },
+  'diffEditor.renderSideBySide': {
+    type: 'boolean',
+    default: DIFF_EDITOR_DEFAULTS.renderSideBySide,
     description: '%diffEditor.configuration.renderSideBySide%',
   },
   'diffEditor.ignoreTrimWhitespace': {
     type: 'boolean',
-    default: false,
+    default: DIFF_EDITOR_DEFAULTS.ignoreTrimWhitespace,
     description: '%diffEditor.configuration.ignoreTrimWhitespace%',
   },
-  'editor.experimental.stickyScroll.enabled': {
+  'diffEditor.hideUnchangedRegions.enabled': {
     type: 'boolean',
-    default: false,
-    description: '%editor.configuration.experimental.stickyScroll.enabled%',
+    default: DIFF_EDITOR_DEFAULTS.hideUnchangedRegions.enabled,
+    description: 'Controls whether the diff editor shows unchanged regions.',
   },
-  'editor.mouseBackForwardToNavigate': {
+  'diffEditor.hideUnchangedRegions.revealLineCount': {
+    type: 'integer',
+    default: DIFF_EDITOR_DEFAULTS.hideUnchangedRegions.revealLineCount,
+    description: 'Controls how many lines are used for unchanged regions.',
+    minimum: 1,
+  },
+  'diffEditor.hideUnchangedRegions.minimumLineCount': {
+    type: 'integer',
+    default: DIFF_EDITOR_DEFAULTS.hideUnchangedRegions.minimumLineCount,
+    description: 'Controls how many lines are used as a minimum for unchanged regions.',
+    minimum: 1,
+  },
+  'diffEditor.hideUnchangedRegions.contextLineCount': {
+    type: 'integer',
+    default: DIFF_EDITOR_DEFAULTS.hideUnchangedRegions.contextLineCount,
+    description: 'Controls how many lines are used as context when comparing unchanged regions.',
+    minimum: 1,
+  },
+  'diffEditor.experimental.showMoves': {
     type: 'boolean',
-    default: true,
-    description: '%editor.configuration.mouseBackForwardToNavigate%',
+    default: DIFF_EDITOR_DEFAULTS.experimental.showMoves,
+    description: 'Controls whether the diff editor should show detected code moves.',
+  },
+  'diffEditor.experimental.showEmptyDecorations': {
+    type: 'boolean',
+    default: DIFF_EDITOR_DEFAULTS.experimental.showEmptyDecorations,
+    description:
+      'Controls whether the diff editor shows empty decorations to see where characters got inserted or deleted.',
+  },
+  'diffEditor.experimental.collapseUnchangedRegions': {
+    type: 'boolean',
+    default: DIFF_EDITOR_DEFAULTS.experimental.collapseUnchangedRegions,
+    description: 'Controls whether the diff editor shows unchanged regions.',
   },
 };
 

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