@theia/scm 1.67.0-next.56 → 1.67.0-next.86

package/lib/browser/merge-editor/merge-editor-contribution.js

@@ -0,0 +1,335 @@
+"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
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MergeEditorContribution = exports.MergeEditorCommands = void 0;
+const tslib_1 = require("tslib");
+const inversify_1 = require("@theia/core/shared/inversify");
+const core_1 = require("@theia/core");
+const browser_1 = require("@theia/core/lib/browser");
+const color_1 = require("@theia/core/lib/common/color");
+const scm_colors_1 = require("../scm-colors");
+const merge_editor_1 = require("./merge-editor");
+var MergeEditorCommands;
+(function (MergeEditorCommands) {
+    MergeEditorCommands.MERGE_EDITOR_CATEGORY = 'Merge Editor';
+    MergeEditorCommands.ACCEPT_MERGE = core_1.Command.toDefaultLocalizedCommand({
+        id: 'mergeEditor.acceptMerge', // don't change: this is an API command
+        label: 'Complete Merge',
+        category: MergeEditorCommands.MERGE_EDITOR_CATEGORY
+    });
+    MergeEditorCommands.GO_TO_NEXT_UNHANDLED_CONFLICT = core_1.Command.toDefaultLocalizedCommand({
+        id: 'mergeEditor.goToNextUnhandledConflict',
+        label: 'Go to Next Unhandled Conflict',
+        category: MergeEditorCommands.MERGE_EDITOR_CATEGORY
+    });
+    MergeEditorCommands.GO_TO_PREVIOUS_UNHANDLED_CONFLICT = core_1.Command.toDefaultLocalizedCommand({
+        id: 'mergeEditor.goToPreviousUnhandledConflict',
+        label: 'Go to Previous Unhandled Conflict',
+        category: MergeEditorCommands.MERGE_EDITOR_CATEGORY
+    });
+    MergeEditorCommands.SET_MIXED_LAYOUT = core_1.Command.toDefaultLocalizedCommand({
+        id: 'mergeEditor.setMixedLayout',
+        label: 'Mixed Layout',
+        category: MergeEditorCommands.MERGE_EDITOR_CATEGORY
+    });
+    MergeEditorCommands.SET_COLUMN_LAYOUT = core_1.Command.toDefaultLocalizedCommand({
+        id: 'mergeEditor.setColumnLayout',
+        label: 'Column Layout',
+        category: MergeEditorCommands.MERGE_EDITOR_CATEGORY
+    });
+    MergeEditorCommands.SHOW_BASE = core_1.Command.toDefaultLocalizedCommand({
+        id: 'mergeEditor.showBase',
+        label: 'Show Base',
+        category: MergeEditorCommands.MERGE_EDITOR_CATEGORY
+    });
+    MergeEditorCommands.SHOW_BASE_TOP = core_1.Command.toDefaultLocalizedCommand({
+        id: 'mergeEditor.showBaseTop',
+        label: 'Show Base Top',
+        category: MergeEditorCommands.MERGE_EDITOR_CATEGORY
+    });
+    MergeEditorCommands.SHOW_BASE_CENTER = core_1.Command.toDefaultLocalizedCommand({
+        id: 'mergeEditor.showBaseCenter',
+        label: 'Show Base Center',
+        category: MergeEditorCommands.MERGE_EDITOR_CATEGORY
+    });
+})(MergeEditorCommands || (exports.MergeEditorCommands = MergeEditorCommands = {}));
+let MergeEditorContribution = class MergeEditorContribution {
+    onStart() {
+        this.settings.load();
+    }
+    onStop() {
+        this.settings.save();
+    }
+    getMergeEditor(widget = this.shell.currentWidget) {
+        return widget instanceof merge_editor_1.MergeEditor ? widget : ((widget === null || widget === void 0 ? void 0 : widget.parent) ? this.getMergeEditor(widget.parent) : undefined);
+    }
+    registerCommands(commands) {
+        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 browser_1.ConfirmDialog({
+                            title: core_1.nls.localizeByDefault('Do you want to complete the merge of {0}?', this.labelProvider.getName(editor.resultUri)),
+                            msg: core_1.nls.localizeByDefault('The file contains unhandled conflicts.'),
+                            ok: core_1.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 => { var _a; return ((_a = this.getMergeEditor(widget)) === null || _a === void 0 ? void 0 : _a.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 => { var _a; return ((_a = this.getMergeEditor(widget)) === null || _a === void 0 ? void 0 : _a.layoutKind) === 'columns'; }
+        });
+        commands.registerCommand(MergeEditorCommands.SHOW_BASE, {
+            execute: widget => {
+                const editor = this.getMergeEditor(widget);
+                if (editor) {
+                    editor.toggleShowBase();
+                    editor.activate();
+                }
+            },
+            isEnabled: widget => { var _a; return ((_a = this.getMergeEditor(widget)) === null || _a === void 0 ? void 0 : _a.layoutKind) === 'columns'; },
+            isVisible: widget => { var _a; return ((_a = this.getMergeEditor(widget)) === null || _a === void 0 ? void 0 : _a.layoutKind) === 'columns'; },
+            isToggled: widget => { var _a; return !!((_a = this.getMergeEditor(widget)) === null || _a === void 0 ? void 0 : _a.isShowingBase); }
+        });
+        commands.registerCommand(MergeEditorCommands.SHOW_BASE_TOP, {
+            execute: widget => {
+                const editor = this.getMergeEditor(widget);
+                if (editor) {
+                    editor.toggleShowBaseTop();
+                    editor.activate();
+                }
+            },
+            isEnabled: widget => { var _a; return ((_a = this.getMergeEditor(widget)) === null || _a === void 0 ? void 0 : _a.layoutKind) === 'mixed'; },
+            isVisible: widget => { var _a; return ((_a = this.getMergeEditor(widget)) === null || _a === void 0 ? void 0 : _a.layoutKind) === 'mixed'; },
+            isToggled: widget => { var _a; return !!((_a = this.getMergeEditor(widget)) === null || _a === void 0 ? void 0 : _a.isShowingBaseAtTop); }
+        });
+        commands.registerCommand(MergeEditorCommands.SHOW_BASE_CENTER, {
+            execute: widget => {
+                const editor = this.getMergeEditor(widget);
+                if (editor) {
+                    editor.toggleShowBaseCenter();
+                    editor.activate();
+                }
+            },
+            isEnabled: widget => { var _a; return ((_a = this.getMergeEditor(widget)) === null || _a === void 0 ? void 0 : _a.layoutKind) === 'mixed'; },
+            isVisible: widget => { var _a; return ((_a = this.getMergeEditor(widget)) === null || _a === void 0 ? void 0 : _a.layoutKind) === 'mixed'; },
+            isToggled: widget => {
+                const editor = this.getMergeEditor(widget);
+                return !!((editor === null || editor === void 0 ? void 0 : editor.isShowingBase) && !editor.isShowingBaseAtTop);
+            }
+        });
+    }
+    registerMenus(menus) {
+    }
+    registerToolbarItems(registry) {
+        registry.registerItem({
+            id: MergeEditorCommands.GO_TO_NEXT_UNHANDLED_CONFLICT.id,
+            command: MergeEditorCommands.GO_TO_NEXT_UNHANDLED_CONFLICT.id,
+            icon: (0, browser_1.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: (0, browser_1.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) {
+    }
+    /**
+     * It should be aligned with https://code.visualstudio.com/api/references/theme-color#merge-conflicts-colors
+     */
+    registerColors(colors) {
+        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_1.Color.transparent('mergeEditor.conflict.unhandledUnfocused.border', 0.05),
+                light: color_1.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_1.Color.transparent('mergeEditor.conflict.unhandledFocused.border', 0.05),
+                light: color_1.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_1.Color.transparent('mergeEditor.conflict.handledUnfocused.border', 0.1),
+                light: color_1.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_1.Color.transparent('mergeEditor.conflict.handledFocused.border', 0.1),
+                light: color_1.Color.transparent('mergeEditor.conflict.handledFocused.border', 0.1)
+            }
+        }, {
+            id: scm_colors_1.ScmColors.handledConflictMinimapOverviewRulerColor,
+            description: 'Minimap gutter and overview ruler marker color for handled conflicts.',
+            defaults: { dark: '#adaca8ee', light: '#adaca8ee', hcDark: '#adaca8ee', hcLight: '#adaca8ee' }
+        }, {
+            id: scm_colors_1.ScmColors.unhandledConflictMinimapOverviewRulerColor,
+            description: 'Minimap gutter and overview ruler marker color for unhandled conflicts.',
+            defaults: { dark: '#fcba03FF', light: '#fcba03FF', hcDark: '#fcba03FF', hcLight: '#fcba03FF' }
+        });
+    }
+};
+exports.MergeEditorContribution = MergeEditorContribution;
+tslib_1.__decorate([
+    (0, inversify_1.inject)(merge_editor_1.MergeEditorSettings),
+    tslib_1.__metadata("design:type", merge_editor_1.MergeEditorSettings)
+], MergeEditorContribution.prototype, "settings", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(browser_1.ApplicationShell),
+    tslib_1.__metadata("design:type", browser_1.ApplicationShell)
+], MergeEditorContribution.prototype, "shell", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(browser_1.LabelProvider),
+    tslib_1.__metadata("design:type", browser_1.LabelProvider)
+], MergeEditorContribution.prototype, "labelProvider", void 0);
+exports.MergeEditorContribution = MergeEditorContribution = tslib_1.__decorate([
+    (0, inversify_1.injectable)()
+], MergeEditorContribution);
+//# sourceMappingURL=merge-editor-contribution.js.map

package/lib/browser/merge-editor/merge-editor-contribution.js.map

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

package/lib/browser/merge-editor/merge-editor-dev-contribution.d.ts

@@ -0,0 +1,31 @@
+import { Command, CommandContribution, CommandRegistry, InMemoryResources, MessageService, QuickInputService } from '@theia/core';
+import { ApplicationShell, OpenerService } from '@theia/core/lib/browser';
+import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
+import { LanguageService } from '@theia/core/lib/browser/language-service';
+import { MergeEditor } from './merge-editor';
+export declare namespace MergeEditorDevCommands {
+    const MERGE_EDITOR_DEV_CATEGORY = "Merge Editor (Dev)";
+    const COPY_CONTENTS_TO_JSON: Command;
+    const OPEN_CONTENTS_FROM_JSON: Command;
+}
+export declare class MergeEditorDevContribution implements CommandContribution {
+    protected readonly shell: ApplicationShell;
+    protected readonly clipboardService: ClipboardService;
+    protected readonly messageService: MessageService;
+    protected readonly quickInputService: QuickInputService;
+    protected readonly languageService: LanguageService;
+    protected readonly inMemoryResources: InMemoryResources;
+    protected readonly openerService: OpenerService;
+    protected getMergeEditor(widget?: import("@lumino/widgets/types/widget").Widget | undefined): MergeEditor | undefined;
+    registerCommands(commands: CommandRegistry): void;
+    protected copyContentsToJSON(editor: MergeEditor): void;
+    protected openContentsFromJSON(): Promise<void>;
+}
+export interface MergeEditorContents {
+    base: string;
+    input1: string;
+    input2: string;
+    result: string;
+    languageId?: string;
+}
+//# sourceMappingURL=merge-editor-dev-contribution.d.ts.map

package/lib/browser/merge-editor/merge-editor-dev-contribution.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-editor-dev-contribution.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor-dev-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAsC,iBAAiB,EAAE,cAAc,EAAO,iBAAiB,EAAO,MAAM,aAAa,CAAC;AAChL,OAAO,EAAE,gBAAgB,EAAQ,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,WAAW,EAA4C,MAAM,gBAAgB,CAAC;AAEvF,yBAAiB,sBAAsB,CAAC;IAC7B,MAAM,yBAAyB,uBAAuB,CAAC;IACvD,MAAM,qBAAqB,SAIhC,CAAC;IACI,MAAM,uBAAuB,SAIlC,CAAC;CACN;AAED,qBACa,0BAA2B,YAAW,mBAAmB;IAGlE,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC;IAG3C,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAEhD,SAAS,CAAC,cAAc,CAAC,MAAM,4DAA2B,GAAG,WAAW,GAAG,SAAS;IAIpF,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAgBjD,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI;cAavC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;CAmDxD;AAED,MAAM,WAAW,mBAAmB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB"}

package/lib/browser/merge-editor/merge-editor-dev-contribution.js

@@ -0,0 +1,151 @@
+"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
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MergeEditorDevContribution = exports.MergeEditorDevCommands = void 0;
+const tslib_1 = require("tslib");
+const inversify_1 = require("@theia/core/shared/inversify");
+const core_1 = require("@theia/core");
+const browser_1 = require("@theia/core/lib/browser");
+const clipboard_service_1 = require("@theia/core/lib/browser/clipboard-service");
+const language_service_1 = require("@theia/core/lib/browser/language-service");
+const merge_editor_1 = require("./merge-editor");
+var MergeEditorDevCommands;
+(function (MergeEditorDevCommands) {
+    MergeEditorDevCommands.MERGE_EDITOR_DEV_CATEGORY = 'Merge Editor (Dev)';
+    MergeEditorDevCommands.COPY_CONTENTS_TO_JSON = core_1.Command.toDefaultLocalizedCommand({
+        id: 'mergeEditor.dev.copyContentsToJSON',
+        label: 'Copy Merge Editor State as JSON',
+        category: MergeEditorDevCommands.MERGE_EDITOR_DEV_CATEGORY
+    });
+    MergeEditorDevCommands.OPEN_CONTENTS_FROM_JSON = core_1.Command.toDefaultLocalizedCommand({
+        id: 'mergeEditor.dev.openContentsFromJSON',
+        label: 'Open Merge Editor State from JSON',
+        category: MergeEditorDevCommands.MERGE_EDITOR_DEV_CATEGORY
+    });
+})(MergeEditorDevCommands || (exports.MergeEditorDevCommands = MergeEditorDevCommands = {}));
+let MergeEditorDevContribution = class MergeEditorDevContribution {
+    getMergeEditor(widget = this.shell.currentWidget) {
+        return widget instanceof merge_editor_1.MergeEditor ? widget : ((widget === null || widget === void 0 ? void 0 : widget.parent) ? this.getMergeEditor(widget.parent) : undefined);
+    }
+    registerCommands(commands) {
+        commands.registerCommand(MergeEditorDevCommands.COPY_CONTENTS_TO_JSON, {
+            execute: widget => {
+                const editor = this.getMergeEditor(widget);
+                if (editor) {
+                    this.copyContentsToJSON(editor);
+                }
+            },
+            isEnabled: widget => !!this.getMergeEditor(widget),
+            isVisible: widget => !!this.getMergeEditor(widget)
+        });
+        commands.registerCommand(MergeEditorDevCommands.OPEN_CONTENTS_FROM_JSON, {
+            execute: () => this.openContentsFromJSON().catch(error => this.messageService.error(error.message))
+        });
+    }
+    copyContentsToJSON(editor) {
+        const { model } = editor;
+        const editorContents = {
+            base: model.baseDocument.getText(),
+            input1: model.side1Document.getText(),
+            input2: model.side2Document.getText(),
+            result: model.resultDocument.getText(),
+            languageId: model.resultDocument.getLanguageId()
+        };
+        this.clipboardService.writeText(JSON.stringify(editorContents, undefined, 2));
+        this.messageService.info(core_1.nls.localizeByDefault('Successfully copied merge editor state'));
+    }
+    async openContentsFromJSON() {
+        var _a, _b;
+        const inputText = await this.quickInputService.input({
+            prompt: core_1.nls.localizeByDefault('Enter JSON'),
+            value: await this.clipboardService.readText()
+        });
+        if (!inputText) {
+            return;
+        }
+        const { base, input1, input2, result, languageId } = Object.assign({
+            base: '',
+            input1: '',
+            input2: '',
+            result: '',
+            languageId: 'plaintext'
+        }, JSON.parse(inputText));
+        const extension = Array.from((_b = (_a = this.languageService.getLanguage(languageId)) === null || _a === void 0 ? void 0 : _a.extensions) !== null && _b !== void 0 ? _b : [''])[0];
+        const parentUri = new core_1.URI('merge-editor-dev://' + (0, core_1.generateUuid)());
+        const baseUri = parentUri.resolve('base' + extension);
+        const side1Uri = parentUri.resolve('side1' + extension);
+        const side2Uri = parentUri.resolve('side2' + extension);
+        const resultUri = parentUri.resolve('result' + extension);
+        const toDispose = new core_1.DisposableCollection();
+        try {
+            toDispose.push(this.inMemoryResources.add(baseUri, base));
+            toDispose.push(this.inMemoryResources.add(side1Uri, input1));
+            toDispose.push(this.inMemoryResources.add(side2Uri, input2));
+            toDispose.push(this.inMemoryResources.add(resultUri, result));
+            const uri = merge_editor_1.MergeEditorUri.encode({ baseUri, side1Uri, side2Uri, resultUri });
+            const options = {
+                widgetState: {
+                    side1State: {
+                        title: 'Left',
+                        description: '(from JSON)'
+                    },
+                    side2State: {
+                        title: 'Right',
+                        description: '(from JSON)'
+                    }
+                }
+            };
+            await (0, browser_1.open)(this.openerService, uri, options);
+        }
+        finally {
+            toDispose.dispose();
+        }
+    }
+};
+exports.MergeEditorDevContribution = MergeEditorDevContribution;
+tslib_1.__decorate([
+    (0, inversify_1.inject)(browser_1.ApplicationShell),
+    tslib_1.__metadata("design:type", browser_1.ApplicationShell)
+], MergeEditorDevContribution.prototype, "shell", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(clipboard_service_1.ClipboardService),
+    tslib_1.__metadata("design:type", Object)
+], MergeEditorDevContribution.prototype, "clipboardService", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(core_1.MessageService),
+    tslib_1.__metadata("design:type", core_1.MessageService)
+], MergeEditorDevContribution.prototype, "messageService", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(core_1.QuickInputService),
+    tslib_1.__metadata("design:type", Object)
+], MergeEditorDevContribution.prototype, "quickInputService", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(language_service_1.LanguageService),
+    tslib_1.__metadata("design:type", language_service_1.LanguageService)
+], MergeEditorDevContribution.prototype, "languageService", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(core_1.InMemoryResources),
+    tslib_1.__metadata("design:type", core_1.InMemoryResources)
+], MergeEditorDevContribution.prototype, "inMemoryResources", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(browser_1.OpenerService),
+    tslib_1.__metadata("design:type", Object)
+], MergeEditorDevContribution.prototype, "openerService", void 0);
+exports.MergeEditorDevContribution = MergeEditorDevContribution = tslib_1.__decorate([
+    (0, inversify_1.injectable)()
+], MergeEditorDevContribution);
+//# sourceMappingURL=merge-editor-dev-contribution.js.map

package/lib/browser/merge-editor/merge-editor-dev-contribution.js.map

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

package/lib/browser/merge-editor/merge-editor-module.d.ts

@@ -0,0 +1,24 @@
+import '../../../src/browser/style/merge-editor.css';
+import { interfaces } from '@theia/core/shared/inversify';
+import { DisposableCollection, URI } from '@theia/core';
+import { EditorManager, EditorWidget } from '@theia/editor/lib/browser';
+import { MergeEditor, MergeUris } from './merge-editor';
+export declare function bindMergeEditor(bind: interfaces.Bind): void;
+export declare class MergeEditorFactory {
+    protected readonly container: interfaces.Container;
+    protected readonly editorManager: EditorManager;
+    constructor(container: interfaces.Container, editorManager?: EditorManager);
+    createMergeEditor({ baseUri, side1Uri, side2Uri, resultUri }: MergeUris): Promise<MergeEditor>;
+    protected createEditorWidget(uri: URI, disposables: DisposableCollection): Promise<EditorWidget>;
+    protected createMergeEditorContainer({ baseEditorWidget, side1EditorWidget, side2EditorWidget, resultEditorWidget, options }: MergeEditorContainerProps): interfaces.Container;
+}
+export interface MergeEditorContainerProps {
+    baseEditorWidget: EditorWidget;
+    side1EditorWidget: EditorWidget;
+    side2EditorWidget: EditorWidget;
+    resultEditorWidget: EditorWidget;
+    options?: {
+        resetResult?: boolean;
+    };
+}
+//# sourceMappingURL=merge-editor-module.d.ts.map

package/lib/browser/merge-editor/merge-editor-module.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-editor-module.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor-module.ts"],"names":[],"mappings":"AAgBA,OAAO,6CAA6C,CAAC;AAErD,OAAO,EAAa,UAAU,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAuB,oBAAoB,EAAoB,GAAG,EAAE,MAAM,aAAa,CAAC;AAI/F,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAMxE,OAAO,EAAE,WAAW,EAA+D,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAIrH,wBAAgB,eAAe,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CAmB3D;AAED,qBAAa,kBAAkB;IAGvB,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC,SAAS;IAClD,SAAS,CAAC,QAAQ,CAAC,aAAa;gBADb,SAAS,EAAE,UAAU,CAAC,SAAS,EAC/B,aAAa,gBAA+B;IAG7D,iBAAiB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;cAwBpF,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,oBAAoB,GAAG,OAAO,CAAC,YAAY,CAAC;IAYtG,SAAS,CAAC,0BAA0B,CAAC,EACjC,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,OAAO,EACV,EAAE,yBAAyB,GAAG,UAAU,CAAC,SAAS;CAoBtD;AAED,MAAM,WAAW,yBAAyB;IACtC,gBAAgB,EAAE,YAAY,CAAC;IAC/B,iBAAiB,EAAE,YAAY,CAAC;IAChC,iBAAiB,EAAE,YAAY,CAAC;IAChC,kBAAkB,EAAE,YAAY,CAAC;IACjC,OAAO,CAAC,EAAE;QACN,WAAW,CAAC,EAAE,OAAO,CAAC;KACzB,CAAA;CACJ"}