@theia/scm 1.64.0-next.28 → 1.64.0

package/lib/browser/merge-editor/view/merge-range-actions.js

@@ -0,0 +1,142 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2025 1C-Soft LLC and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// copied and modified from https://github.com/microsoft/vscode/blob/1.96.3/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.ts
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MergeRangeActions = void 0;
+const observable_1 = require("@theia/core/lib/common/observable");
+const merge_range_1 = require("../model/merge-range");
+const core_1 = require("@theia/core");
+class MergeRangeActions {
+    get hasSideActions() { return this.hasSideActionsObservable.get(); }
+    get hasResultActions() { return this.hasResultActionsObservable.get(); }
+    constructor(mergeEditor, mergeRange) {
+        this.mergeEditor = mergeEditor;
+        this.mergeRange = mergeRange;
+        this.side1ActionsObservable = observable_1.DerivedObservable.create(() => this.getActionsForSide(1));
+        this.side2ActionsObservable = observable_1.DerivedObservable.create(() => this.getActionsForSide(2));
+        this.resultActionsObservable = observable_1.DerivedObservable.create(() => this.getResultActions());
+        this.hasSideActionsObservable = observable_1.DerivedObservable.create(() => this.side1ActionsObservable.get().length + this.side2ActionsObservable.get().length > 0);
+        this.hasResultActionsObservable = observable_1.DerivedObservable.create(() => this.resultActionsObservable.get().length > 0);
+    }
+    getActionsForSide(side) {
+        const { mergeEditor, mergeRange } = this;
+        const { model, side1Title, side2Title } = mergeEditor;
+        if (!model.hasMergeRange(mergeRange)) {
+            return [];
+        }
+        const result = [];
+        const sideTitle = side === 1 ? side1Title : side2Title;
+        const state = model.getMergeRangeResultState(mergeRange);
+        if (state !== 'Unrecognized' && !state.includes('Side' + side)) {
+            if (state !== 'Base' || mergeRange.getChanges(side).length) {
+                result.push({
+                    text: core_1.nls.localizeByDefault('Accept {0}', sideTitle),
+                    tooltip: core_1.nls.localizeByDefault('Accept {0} in the result document.', sideTitle),
+                    run: () => this.applyMergeRangeAcceptedState(mergeRange, merge_range_1.MergeRangeAcceptedState.addSide(state, side))
+                });
+            }
+            if (mergeRange.canBeSmartCombined(side)) {
+                result.push({
+                    text: mergeRange.isSmartCombinationOrderRelevant ?
+                        core_1.nls.localizeByDefault('Accept Combination ({0} First)', sideTitle) :
+                        core_1.nls.localizeByDefault('Accept Combination'),
+                    tooltip: core_1.nls.localizeByDefault('Accept an automatic combination of both sides in the result document.'),
+                    run: () => this.applyMergeRangeAcceptedState(mergeRange, merge_range_1.MergeRangeAcceptedState.addSide(side === 1 ? 'Side1' : 'Side2', side === 1 ? 2 : 1, { smartCombination: true }))
+                });
+            }
+        }
+        return result;
+    }
+    getResultActions() {
+        const { mergeEditor, mergeRange } = this;
+        const { model, side1Title, side2Title } = mergeEditor;
+        if (!model.hasMergeRange(mergeRange)) {
+            return [];
+        }
+        const result = [];
+        const state = model.getMergeRangeResultState(mergeRange);
+        if (state === 'Unrecognized') {
+            result.push({
+                text: core_1.nls.localizeByDefault('Manual Resolution'),
+                tooltip: core_1.nls.localizeByDefault('This conflict has been resolved manually.')
+            });
+            result.push({
+                text: core_1.nls.localizeByDefault('Reset to base'),
+                tooltip: core_1.nls.localizeByDefault('Reset this conflict to the common ancestor of both the right and left changes.'),
+                run: () => this.applyMergeRangeAcceptedState(mergeRange, 'Base')
+            });
+        }
+        else if (state === 'Base') {
+            result.push({
+                text: core_1.nls.localizeByDefault('No Changes Accepted'),
+                tooltip: core_1.nls.localizeByDefault('The current resolution of this conflict equals the common ancestor of both the right and left changes.')
+            });
+            if (!model.isMergeRangeHandled(mergeRange)) {
+                result.push({
+                    text: core_1.nls.localizeByDefault('Mark as Handled'),
+                    run: () => this.applyMergeRangeAcceptedState(mergeRange, state)
+                });
+            }
+        }
+        else {
+            const labels = [];
+            const stateToggles = [];
+            if (state.includes('Side1')) {
+                labels.push(side1Title);
+                stateToggles.push({
+                    text: core_1.nls.localizeByDefault('Remove {0}', side1Title),
+                    tooltip: core_1.nls.localizeByDefault('Remove {0} from the result document.', side1Title),
+                    run: () => this.applyMergeRangeAcceptedState(mergeRange, merge_range_1.MergeRangeAcceptedState.removeSide(state, 1))
+                });
+            }
+            if (state.includes('Side2')) {
+                labels.push(side2Title);
+                stateToggles.push({
+                    text: core_1.nls.localizeByDefault('Remove {0}', side2Title),
+                    tooltip: core_1.nls.localizeByDefault('Remove {0} from the result document.', side2Title),
+                    run: () => this.applyMergeRangeAcceptedState(mergeRange, merge_range_1.MergeRangeAcceptedState.removeSide(state, 2))
+                });
+            }
+            if (state.startsWith('Side2')) {
+                labels.reverse();
+                stateToggles.reverse();
+            }
+            if (labels.length) {
+                result.push({
+                    text: labels.join(' + ')
+                });
+            }
+            result.push(...stateToggles);
+        }
+        return result;
+    }
+    async applyMergeRangeAcceptedState(mergeRange, state) {
+        const { model, resultPane } = this.mergeEditor;
+        resultPane.activate();
+        await observable_1.ObservableUtils.waitForState(model.isUpToDateObservable);
+        resultPane.goToMergeRange(mergeRange, { reveal: false }); // set the cursor state that will be restored when undoing the operation
+        model.applyMergeRangeAcceptedState(mergeRange, state);
+        await observable_1.ObservableUtils.waitForState(model.isUpToDateObservable);
+        resultPane.goToMergeRange(mergeRange, { reveal: false }); // set the resulting cursor state
+    }
+}
+exports.MergeRangeActions = MergeRangeActions;
+//# sourceMappingURL=merge-range-actions.js.map

package/lib/browser/merge-editor/view/merge-range-actions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-range-actions.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/view/merge-range-actions.ts"],"names":[],"mappings":"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"}

package/lib/browser/scm-colors.d.ts

@@ -2,5 +2,7 @@ export declare namespace ScmColors {
     const editorGutterModifiedBackground = "editorGutter.modifiedBackground";
     const editorGutterAddedBackground = "editorGutter.addedBackground";
     const editorGutterDeletedBackground = "editorGutter.deletedBackground";
+    const handledConflictMinimapOverviewRulerColor = "mergeEditor.conflict.handled.minimapOverViewRuler";
+    const unhandledConflictMinimapOverviewRulerColor = "mergeEditor.conflict.unhandled.minimapOverViewRuler";
 }
 //# sourceMappingURL=scm-colors.d.ts.map

package/lib/browser/scm-colors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scm-colors.d.ts","sourceRoot":"","sources":["../../src/browser/scm-colors.ts"],"names":[],"mappings":"AAgBA,yBAAiB,SAAS,CAAC;IAChB,MAAM,8BAA8B,oCAAoC,CAAC;IACzE,MAAM,2BAA2B,iCAAiC,CAAC;IACnE,MAAM,6BAA6B,mCAAmC,CAAC;CACjF"}
+{"version":3,"file":"scm-colors.d.ts","sourceRoot":"","sources":["../../src/browser/scm-colors.ts"],"names":[],"mappings":"AAgBA,yBAAiB,SAAS,CAAC;IAChB,MAAM,8BAA8B,oCAAoC,CAAC;IACzE,MAAM,2BAA2B,iCAAiC,CAAC;IACnE,MAAM,6BAA6B,mCAAmC,CAAC;IACvE,MAAM,wCAAwC,sDAAsD,CAAC;IACrG,MAAM,0CAA0C,wDAAwD,CAAC;CACnH"}

package/lib/browser/scm-colors.js

@@ -21,5 +21,7 @@ var ScmColors;
     ScmColors.editorGutterModifiedBackground = 'editorGutter.modifiedBackground';
     ScmColors.editorGutterAddedBackground = 'editorGutter.addedBackground';
     ScmColors.editorGutterDeletedBackground = 'editorGutter.deletedBackground';
+    ScmColors.handledConflictMinimapOverviewRulerColor = 'mergeEditor.conflict.handled.minimapOverViewRuler';
+    ScmColors.unhandledConflictMinimapOverviewRulerColor = 'mergeEditor.conflict.unhandled.minimapOverViewRuler';
 })(ScmColors || (exports.ScmColors = ScmColors = {}));
 //# sourceMappingURL=scm-colors.js.map

package/lib/browser/scm-colors.js.map

@@ -1 +1 @@
-{"version":3,"file":"scm-colors.js","sourceRoot":"","sources":["../../src/browser/scm-colors.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,IAAiB,SAAS,CAIzB;AAJD,WAAiB,SAAS;IACT,wCAA8B,GAAG,iCAAiC,CAAC;IACnE,qCAA2B,GAAG,8BAA8B,CAAC;IAC7D,uCAA6B,GAAG,gCAAgC,CAAC;AAClF,CAAC,EAJgB,SAAS,yBAAT,SAAS,QAIzB"}
+{"version":3,"file":"scm-colors.js","sourceRoot":"","sources":["../../src/browser/scm-colors.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,IAAiB,SAAS,CAMzB;AAND,WAAiB,SAAS;IACT,wCAA8B,GAAG,iCAAiC,CAAC;IACnE,qCAA2B,GAAG,8BAA8B,CAAC;IAC7D,uCAA6B,GAAG,gCAAgC,CAAC;IACjE,kDAAwC,GAAG,mDAAmD,CAAC;IAC/F,oDAA0C,GAAG,qDAAqD,CAAC;AACpH,CAAC,EANgB,SAAS,yBAAT,SAAS,QAMzB"}

package/lib/browser/scm-frontend-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scm-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/scm-frontend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,mCAAmC,CAAC;AAE3C,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;;AA6BtF,wBA2EG;AAEH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,GAAG,SAAS,CAiB9E;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,GAAG,SAAS,CAKhF"}
+{"version":3,"file":"scm-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/scm-frontend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,mCAAmC,CAAC;AAE3C,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;;AA+BtF,wBA6EG;AAEH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,GAAG,SAAS,CAiB9E;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,GAAG,SAAS,CAKhF"}

package/lib/browser/scm-frontend-module.js

@@ -41,6 +41,7 @@ const label_provider_1 = require("@theia/core/lib/browser/label-provider");
 const scm_preferences_1 = require("./scm-preferences");
 const scm_tab_bar_decorator_1 = require("./decorations/scm-tab-bar-decorator");
 const tab_bar_decorator_1 = require("@theia/core/lib/browser/shell/tab-bar-decorator");
+const merge_editor_module_1 = require("./merge-editor/merge-editor-module");
 exports.default = new inversify_1.ContainerModule(bind => {
     bind(scm_context_key_service_1.ScmContextKeyService).toSelf().inSingletonScope();
     bind(scm_service_1.ScmService).toSelf().inSingletonScope();
@@ -103,6 +104,7 @@ exports.default = new inversify_1.ContainerModule(bind => {
     (0, scm_preferences_1.bindScmPreferences)(bind);
     bind(scm_tab_bar_decorator_1.ScmTabBarDecorator).toSelf().inSingletonScope();
     bind(tab_bar_decorator_1.TabBarDecorator).toService(scm_tab_bar_decorator_1.ScmTabBarDecorator);
+    (0, merge_editor_module_1.bindMergeEditor)(bind);
 });
 function createScmTreeContainer(parent) {
     const child = (0, browser_1.createTreeContainer)(parent, {

package/lib/browser/scm-frontend-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"scm-frontend-module.js","sourceRoot":"","sources":["../../src/browser/scm-frontend-module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scm-frontend-module.js","sourceRoot":"","sources":["../../src/browser/scm-frontend-module.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@theia/scm",
-  "version": "1.64.0-next.28+c0fda4c47",
+  "version": "1.64.0",
   "description": "Theia - Source control Extension",
   "dependencies": {
-    "@theia/core": "1.64.0-next.28+c0fda4c47",
-    "@theia/editor": "1.64.0-next.28+c0fda4c47",
-    "@theia/filesystem": "1.64.0-next.28+c0fda4c47",
-    "@theia/monaco": "1.64.0-next.28+c0fda4c47",
+    "@theia/core": "1.64.0",
+    "@theia/editor": "1.64.0",
+    "@theia/filesystem": "1.64.0",
+    "@theia/monaco": "1.64.0",
     "@theia/monaco-editor-core": "1.96.302",
     "@types/diff": "^5.2.1",
     "diff": "^5.2.0",
@@ -49,10 +49,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.63.0"
+    "@theia/ext-scripts": "1.64.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "c0fda4c4706fcd4ec1616c8e2f24673352a707d1"
+  "gitHead": "4c074e0d16c48e96a044b2f8bc4717de2e031c4b"
 }

package/src/browser/decorations/scm-decorations-service.ts

@@ -52,6 +52,17 @@ export class ScmDecorationsService {
                     updateTask();
                 }
             }));
+            if (editor.onShouldDisplayDirtyDiffChanged) {
+                toDispose.push(editor.onShouldDisplayDirtyDiffChanged(shouldDisplayDirtyDiff => {
+                    if (shouldDisplayDirtyDiff) {
+                        updateTask();
+                    } else {
+                        const update: DirtyDiffUpdate = { editor, changes: [] };
+                        this.decorator.applyDecorations(update);
+                        this.onDirtyDiffUpdateEmitter.fire(update);
+                    }
+                }));
+            }
             editorWidget.disposed.connect(() => {
                 updateTask.cancel();
                 updateTasks.delete(editorWidget);
@@ -72,6 +83,9 @@ export class ScmDecorationsService {
     }
 
     async applyEditorDecorations(editor: TextEditor): Promise<void> {
+        if (!editor.shouldDisplayDirtyDiff()) {
+            return;
+        }
         const currentRepo = this.scmService.selectedRepository;
         if (currentRepo) {
             try {
@@ -82,6 +96,9 @@ export class ScmDecorationsService {
                 const previousResource = await this.resourceProvider(uri);
                 try {
                     const previousContent = await previousResource.readContents();
+                    if (!editor.shouldDisplayDirtyDiff()) { // check again; it might have changed in the meantime, since this is an async method
+                        return;
+                    }
                     const previousLines = ContentLines.fromString(previousContent);
                     const currentLines = ContentLines.fromTextEditorDocument(editor.document);
                     const dirtyDiff = this.diffComputer.computeDirtyDiff(ContentLines.arrayLike(previousLines), ContentLines.arrayLike(currentLines));
@@ -98,7 +115,7 @@ export class ScmDecorationsService {
     }
 
     protected supportsDirtyDiff(editor: TextEditor): boolean {
-        return editor.shouldDisplayDirtyDiff();
+        return editor.shouldDisplayDirtyDiff() || !!editor.onShouldDisplayDirtyDiffChanged;
     }
 
     protected createUpdateTask(editor: TextEditor): { (): void; cancel(): void; } {

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

@@ -0,0 +1,346 @@
+// *****************************************************************************
+// Copyright (C) 2025 1C-Soft LLC and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { Command, CommandContribution, CommandRegistry, MenuContribution, MenuModelRegistry, nls } from '@theia/core';
+import { TabBarToolbarContribution, TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
+import {
+    ApplicationShell,
+    codicon,
+    ConfirmDialog,
+    FrontendApplicationContribution,
+    KeybindingContribution,
+    KeybindingRegistry,
+    LabelProvider
+} from '@theia/core/lib/browser';
+import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
+import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
+import { Color } from '@theia/core/lib/common/color';
+import { ScmColors } from '../scm-colors';
+import { MergeEditor, MergeEditorSettings } from './merge-editor';
+
+export namespace MergeEditorCommands {
+    export const MERGE_EDITOR_CATEGORY = 'Merge Editor';
+    export const ACCEPT_MERGE = Command.toDefaultLocalizedCommand({
+        id: 'mergeEditor.acceptMerge', // don't change: this is an API command
+        label: 'Complete Merge',
+        category: MERGE_EDITOR_CATEGORY
+    });
+    export const GO_TO_NEXT_UNHANDLED_CONFLICT = Command.toDefaultLocalizedCommand({
+        id: 'mergeEditor.goToNextUnhandledConflict',
+        label: 'Go to Next Unhandled Conflict',
+        category: MERGE_EDITOR_CATEGORY
+    });
+    export const GO_TO_PREVIOUS_UNHANDLED_CONFLICT = Command.toDefaultLocalizedCommand({
+        id: 'mergeEditor.goToPreviousUnhandledConflict',
+        label: 'Go to Previous Unhandled Conflict',
+        category: MERGE_EDITOR_CATEGORY
+    });
+    export const SET_MIXED_LAYOUT = Command.toDefaultLocalizedCommand({
+        id: 'mergeEditor.setMixedLayout',
+        label: 'Mixed Layout',
+        category: MERGE_EDITOR_CATEGORY
+    });
+    export const SET_COLUMN_LAYOUT = Command.toDefaultLocalizedCommand({
+        id: 'mergeEditor.setColumnLayout',
+        label: 'Column Layout',
+        category: MERGE_EDITOR_CATEGORY
+    });
+    export const SHOW_BASE = Command.toDefaultLocalizedCommand({
+        id: 'mergeEditor.showBase',
+        label: 'Show Base',
+        category: MERGE_EDITOR_CATEGORY
+    });
+    export const SHOW_BASE_TOP = Command.toDefaultLocalizedCommand({
+        id: 'mergeEditor.showBaseTop',
+        label: 'Show Base Top',
+        category: MERGE_EDITOR_CATEGORY
+    });
+    export const SHOW_BASE_CENTER = Command.toDefaultLocalizedCommand({
+        id: 'mergeEditor.showBaseCenter',
+        label: 'Show Base Center',
+        category: MERGE_EDITOR_CATEGORY
+    });
+}
+
+@injectable()
+export class MergeEditorContribution implements FrontendApplicationContribution,
+    CommandContribution, MenuContribution, TabBarToolbarContribution, KeybindingContribution, ColorContribution {
+
+    @inject(MergeEditorSettings)
+    protected readonly settings: MergeEditorSettings;
+
+    @inject(ApplicationShell)
+    protected readonly shell: ApplicationShell;
+
+    @inject(LabelProvider)
+    protected readonly labelProvider: LabelProvider;
+
+    onStart(): void {
+        this.settings.load();
+    }
+
+    onStop(): void {
+        this.settings.save();
+    }
+
+    protected getMergeEditor(widget = this.shell.currentWidget): MergeEditor | undefined {
+        return widget instanceof MergeEditor ? widget : (widget?.parent ? this.getMergeEditor(widget.parent) : undefined);
+    }
+
+    registerCommands(commands: CommandRegistry): void {
+        commands.registerCommand(MergeEditorCommands.ACCEPT_MERGE, {
+            execute: async widget => {
+                const editor = this.getMergeEditor(widget);
+                if (editor) {
+                    let canceled = false;
+                    if (editor.model.unhandledMergeRangesCount > 0) {
+                        canceled = !(await new ConfirmDialog({
+                            title: nls.localizeByDefault('Do you want to complete the merge of {0}?', this.labelProvider.getName(editor.resultUri)),
+                            msg: nls.localizeByDefault('The file contains unhandled conflicts.'),
+                            ok: nls.localizeByDefault('Complete with Conflicts')
+                        }).open());
+                    }
+                    if (!canceled) {
+                        await editor.model.resultDocument.save();
+                        editor.close();
+                        return {
+                            successful: true
+                        };
+                    }
+                }
+                return {
+                    successful: false
+                };
+            },
+            isEnabled: widget => !!this.getMergeEditor(widget),
+            isVisible: widget => !!this.getMergeEditor(widget)
+        });
+        commands.registerCommand(MergeEditorCommands.GO_TO_NEXT_UNHANDLED_CONFLICT, {
+            execute: widget => {
+                const editor = this.getMergeEditor(widget);
+                if (editor) {
+                    editor.goToNextMergeRange(mergeRange => !editor.model.isMergeRangeHandled(mergeRange));
+                    editor.activate();
+                }
+            },
+            isEnabled: widget => !!this.getMergeEditor(widget),
+            isVisible: widget => !!this.getMergeEditor(widget)
+        });
+        commands.registerCommand(MergeEditorCommands.GO_TO_PREVIOUS_UNHANDLED_CONFLICT, {
+            execute: widget => {
+                const editor = this.getMergeEditor(widget);
+                if (editor) {
+                    editor.goToPreviousMergeRange(mergeRange => !editor.model.isMergeRangeHandled(mergeRange));
+                    editor.activate();
+                }
+            },
+            isEnabled: widget => !!this.getMergeEditor(widget),
+            isVisible: widget => !!this.getMergeEditor(widget)
+        });
+        commands.registerCommand(MergeEditorCommands.SET_MIXED_LAYOUT, {
+            execute: widget => {
+                const editor = this.getMergeEditor(widget);
+                if (editor) {
+                    editor.layoutKind = 'mixed';
+                    editor.activate();
+                }
+            },
+            isEnabled: widget => !!this.getMergeEditor(widget),
+            isVisible: widget => !!this.getMergeEditor(widget),
+            isToggled: widget => this.getMergeEditor(widget)?.layoutKind === 'mixed',
+        });
+        commands.registerCommand(MergeEditorCommands.SET_COLUMN_LAYOUT, {
+            execute: widget => {
+                const editor = this.getMergeEditor(widget);
+                if (editor) {
+                    editor.layoutKind = 'columns';
+                    editor.activate();
+                }
+            },
+            isEnabled: widget => !!this.getMergeEditor(widget),
+            isVisible: widget => !!this.getMergeEditor(widget),
+            isToggled: widget => this.getMergeEditor(widget)?.layoutKind === 'columns'
+        });
+        commands.registerCommand(MergeEditorCommands.SHOW_BASE, {
+            execute: widget => {
+                const editor = this.getMergeEditor(widget);
+                if (editor) {
+                    editor.toggleShowBase();
+                    editor.activate();
+                }
+            },
+            isEnabled: widget => this.getMergeEditor(widget)?.layoutKind === 'columns',
+            isVisible: widget => this.getMergeEditor(widget)?.layoutKind === 'columns',
+            isToggled: widget => !!this.getMergeEditor(widget)?.isShowingBase
+        });
+        commands.registerCommand(MergeEditorCommands.SHOW_BASE_TOP, {
+            execute: widget => {
+                const editor = this.getMergeEditor(widget);
+                if (editor) {
+                    editor.toggleShowBaseTop();
+                    editor.activate();
+                }
+            },
+            isEnabled: widget => this.getMergeEditor(widget)?.layoutKind === 'mixed',
+            isVisible: widget => this.getMergeEditor(widget)?.layoutKind === 'mixed',
+            isToggled: widget => !!this.getMergeEditor(widget)?.isShowingBaseAtTop
+        });
+        commands.registerCommand(MergeEditorCommands.SHOW_BASE_CENTER, {
+            execute: widget => {
+                const editor = this.getMergeEditor(widget);
+                if (editor) {
+                    editor.toggleShowBaseCenter();
+                    editor.activate();
+                }
+            },
+            isEnabled: widget => this.getMergeEditor(widget)?.layoutKind === 'mixed',
+            isVisible: widget => this.getMergeEditor(widget)?.layoutKind === 'mixed',
+            isToggled: widget => {
+                const editor = this.getMergeEditor(widget);
+                return !!(editor?.isShowingBase && !editor.isShowingBaseAtTop);
+            }
+        });
+    }
+
+    registerMenus(menus: MenuModelRegistry): void {
+    }
+
+    registerToolbarItems(registry: TabBarToolbarRegistry): void {
+        registry.registerItem({
+            id: MergeEditorCommands.GO_TO_NEXT_UNHANDLED_CONFLICT.id,
+            command: MergeEditorCommands.GO_TO_NEXT_UNHANDLED_CONFLICT.id,
+            icon: codicon('arrow-down', true),
+            group: 'navigation',
+            order: 'a'
+        });
+        registry.registerItem({
+            id: MergeEditorCommands.GO_TO_PREVIOUS_UNHANDLED_CONFLICT.id,
+            command: MergeEditorCommands.GO_TO_PREVIOUS_UNHANDLED_CONFLICT.id,
+            icon: codicon('arrow-up', true),
+            group: 'navigation',
+            order: 'b'
+        });
+        registry.registerItem({
+            id: MergeEditorCommands.SET_MIXED_LAYOUT.id,
+            command: MergeEditorCommands.SET_MIXED_LAYOUT.id,
+            group: '1_merge',
+            order: 'a'
+        });
+        registry.registerItem({
+            id: MergeEditorCommands.SET_COLUMN_LAYOUT.id,
+            command: MergeEditorCommands.SET_COLUMN_LAYOUT.id,
+            group: '1_merge',
+            order: 'b'
+        });
+        registry.registerItem({
+            id: MergeEditorCommands.SHOW_BASE.id,
+            command: MergeEditorCommands.SHOW_BASE.id,
+            group: '2_merge',
+            order: 'a'
+        });
+        registry.registerItem({
+            id: MergeEditorCommands.SHOW_BASE_TOP.id,
+            command: MergeEditorCommands.SHOW_BASE_TOP.id,
+            group: '2_merge',
+            order: 'b'
+        });
+        registry.registerItem({
+            id: MergeEditorCommands.SHOW_BASE_CENTER.id,
+            command: MergeEditorCommands.SHOW_BASE_CENTER.id,
+            group: '2_merge',
+            order: 'c'
+        });
+    }
+
+    registerKeybindings(keybindings: KeybindingRegistry): void {
+    }
+
+    /**
+     * It should be aligned with https://code.visualstudio.com/api/references/theme-color#merge-conflicts-colors
+     */
+    registerColors(colors: ColorRegistry): void {
+        colors.register({
+            id: 'mergeEditor.change.background',
+            description: 'The background color for changes.',
+            defaults: { dark: '#9bb95533', light: '#9bb95533', hcDark: '#9bb95533', hcLight: '#9bb95533' }
+        }, {
+            id: 'mergeEditor.change.word.background',
+            description: 'The background color for word changes.',
+            defaults: { dark: '#9ccc2c33', light: '#9ccc2c66', hcDark: '#9ccc2c33', hcLight: '#9ccc2c66' }
+        }, {
+            id: 'mergeEditor.changeBase.background',
+            description: 'The background color for changes in base.',
+            defaults: { dark: '#4B1818FF', light: '#FFCCCCFF', hcDark: '#4B1818FF', hcLight: '#FFCCCCFF' }
+        }, {
+            id: 'mergeEditor.changeBase.word.background',
+            description: 'The background color for word changes in base.',
+            defaults: { dark: '#6F1313FF', light: '#FFA3A3FF', hcDark: '#6F1313FF', hcLight: '#FFA3A3FF' }
+        }, {
+            id: 'mergeEditor.conflict.unhandledUnfocused.border',
+            description: 'The border color of unhandled unfocused conflicts.',
+            defaults: { dark: '#ffa6007a', light: '#ffa600FF', hcDark: '#ffa6007a', hcLight: '#ffa6007a' }
+        }, {
+            id: 'mergeEditor.conflict.unhandledUnfocused.background',
+            description: 'The background color of unhandled unfocused conflicts.',
+            defaults: {
+                dark: Color.transparent('mergeEditor.conflict.unhandledUnfocused.border', 0.05),
+                light: Color.transparent('mergeEditor.conflict.unhandledUnfocused.border', 0.05)
+            }
+        }, {
+            id: 'mergeEditor.conflict.unhandledFocused.border',
+            description: 'The border color of unhandled focused conflicts.',
+            defaults: { dark: '#ffa600', light: '#ffa600', hcDark: '#ffa600', hcLight: '#ffa600' }
+        }, {
+            id: 'mergeEditor.conflict.unhandledFocused.background',
+            description: 'The background color of unhandled focused conflicts.',
+            defaults: {
+                dark: Color.transparent('mergeEditor.conflict.unhandledFocused.border', 0.05),
+                light: Color.transparent('mergeEditor.conflict.unhandledFocused.border', 0.05)
+            }
+        }, {
+            id: 'mergeEditor.conflict.handledUnfocused.border',
+            description: 'The border color of handled unfocused conflicts.',
+            defaults: { dark: '#86868649', light: '#86868649', hcDark: '#86868649', hcLight: '#86868649' }
+        }, {
+            id: 'mergeEditor.conflict.handledUnfocused.background',
+            description: 'The background color of handled unfocused conflicts.',
+            defaults: {
+                dark: Color.transparent('mergeEditor.conflict.handledUnfocused.border', 0.1),
+                light: Color.transparent('mergeEditor.conflict.handledUnfocused.border', 0.1)
+            }
+        }, {
+            id: 'mergeEditor.conflict.handledFocused.border',
+            description: 'The border color of handled focused conflicts.',
+            defaults: { dark: '#c1c1c1cc', light: '#c1c1c1cc', hcDark: '#c1c1c1cc', hcLight: '#c1c1c1cc' }
+        }, {
+            id: 'mergeEditor.conflict.handledFocused.background',
+            description: 'The background color of handled focused conflicts.',
+            defaults: {
+                dark: Color.transparent('mergeEditor.conflict.handledFocused.border', 0.1),
+                light: Color.transparent('mergeEditor.conflict.handledFocused.border', 0.1)
+            }
+        }, {
+            id: ScmColors.handledConflictMinimapOverviewRulerColor,
+            description: 'Minimap gutter and overview ruler marker color for handled conflicts.',
+            defaults: { dark: '#adaca8ee', light: '#adaca8ee', hcDark: '#adaca8ee', hcLight: '#adaca8ee' }
+        }, {
+            id: ScmColors.unhandledConflictMinimapOverviewRulerColor,
+            description: 'Minimap gutter and overview ruler marker color for unhandled conflicts.',
+            defaults: { dark: '#fcba03FF', light: '#fcba03FF', hcDark: '#fcba03FF', hcLight: '#fcba03FF' }
+        });
+    }
+}