@theia/scm 1.64.0-next.28 → 1.64.0

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"}

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

@@ -0,0 +1,109 @@
+"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.MergeEditorFactory = exports.bindMergeEditor = void 0;
+require("../../../src/browser/style/merge-editor.css");
+const inversify_1 = require("@theia/core/shared/inversify");
+const core_1 = require("@theia/core");
+const tab_bar_toolbar_1 = require("@theia/core/lib/browser/shell/tab-bar-toolbar");
+const browser_1 = require("@theia/core/lib/browser");
+const color_application_contribution_1 = require("@theia/core/lib/browser/color-application-contribution");
+const browser_2 = require("@theia/editor/lib/browser");
+const monaco_editor_1 = require("@theia/monaco/lib/browser/monaco-editor");
+const merge_editor_model_1 = require("./model/merge-editor-model");
+const merge_editor_panes_1 = require("./view/merge-editor-panes");
+const diff_spacers_1 = require("./view/diff-spacers");
+const merge_editor_view_zones_1 = require("./view/merge-editor-view-zones");
+const merge_editor_1 = require("./merge-editor");
+const merge_editor_contribution_1 = require("./merge-editor-contribution");
+const merge_editor_dev_contribution_1 = require("./merge-editor-dev-contribution");
+function bindMergeEditor(bind) {
+    bind(merge_editor_1.MergeEditorSettings).toSelf().inSingletonScope();
+    bind(diff_spacers_1.DiffSpacerService).toSelf().inSingletonScope();
+    bind(merge_editor_view_zones_1.MergeEditorViewZoneComputer).toSelf().inSingletonScope();
+    bind(MergeEditorFactory).toDynamicValue(ctx => new MergeEditorFactory(ctx.container)).inSingletonScope();
+    bind(browser_1.WidgetFactory).toDynamicValue(ctx => ({
+        id: merge_editor_1.MergeEditorOpenHandler.ID,
+        createWidget: (options) => ctx.container.get(MergeEditorFactory).createMergeEditor(merge_editor_1.MergeEditorUri.decode(new core_1.URI(options.uri)))
+    })).inSingletonScope();
+    bind(merge_editor_1.MergeEditorOpenHandler).toSelf().inSingletonScope();
+    bind(browser_1.OpenHandler).toService(merge_editor_1.MergeEditorOpenHandler);
+    bind(merge_editor_contribution_1.MergeEditorContribution).toSelf().inSingletonScope();
+    [browser_1.FrontendApplicationContribution, core_1.CommandContribution, core_1.MenuContribution, tab_bar_toolbar_1.TabBarToolbarContribution, browser_1.KeybindingContribution, color_application_contribution_1.ColorContribution].forEach(serviceIdentifier => bind(serviceIdentifier).toService(merge_editor_contribution_1.MergeEditorContribution));
+    bind(merge_editor_dev_contribution_1.MergeEditorDevContribution).toSelf().inSingletonScope();
+    bind(core_1.CommandContribution).toService(merge_editor_dev_contribution_1.MergeEditorDevContribution);
+}
+exports.bindMergeEditor = bindMergeEditor;
+class MergeEditorFactory {
+    constructor(container, editorManager = container.get(browser_2.EditorManager)) {
+        this.container = container;
+        this.editorManager = editorManager;
+    }
+    async createMergeEditor({ baseUri, side1Uri, side2Uri, resultUri }) {
+        const toDisposeOnError = new core_1.DisposableCollection();
+        const createEditorWidget = (uri) => this.createEditorWidget(uri, toDisposeOnError);
+        try {
+            const [baseEditorWidget, side1EditorWidget, side2EditorWidget, resultEditorWidget] = await Promise.all([createEditorWidget(baseUri), createEditorWidget(side1Uri), createEditorWidget(side2Uri), createEditorWidget(resultUri)]);
+            const resultDocument = monaco_editor_1.MonacoEditor.get(resultEditorWidget).document;
+            const hasConflictMarkers = resultDocument.textEditorModel.getLinesContent().some(lineContent => lineContent.startsWith('<<<<<<<'));
+            return this.createMergeEditorContainer({
+                baseEditorWidget,
+                side1EditorWidget,
+                side2EditorWidget,
+                resultEditorWidget,
+                options: {
+                    resetResult: hasConflictMarkers
+                }
+            }).get(merge_editor_1.MergeEditor);
+        }
+        catch (error) {
+            toDisposeOnError.dispose();
+            throw error;
+        }
+    }
+    async createEditorWidget(uri, disposables) {
+        const editorWidget = await this.editorManager.createByUri(uri);
+        disposables.push(editorWidget);
+        const editor = monaco_editor_1.MonacoEditor.get(editorWidget);
+        if (!editor) {
+            throw new Error('The merge editor only supports Monaco editors as its parts');
+        }
+        editor.getControl().updateOptions({ folding: false, codeLens: false, minimap: { enabled: false } });
+        editor.setShouldDisplayDirtyDiff(false);
+        return editorWidget;
+    }
+    createMergeEditorContainer({ baseEditorWidget, side1EditorWidget, side2EditorWidget, resultEditorWidget, options }) {
+        const child = new inversify_1.Container({ defaultScope: 'Singleton' });
+        child.parent = this.container;
+        const [baseEditor, side1Editor, side2Editor, resultEditor] = [baseEditorWidget, side1EditorWidget, side2EditorWidget, resultEditorWidget].map(editorWidget => monaco_editor_1.MonacoEditor.get(editorWidget));
+        child.bind(merge_editor_model_1.MergeEditorModelProps).toConstantValue({ baseEditor, side1Editor, side2Editor, resultEditor, options });
+        child.bind(merge_editor_model_1.MergeEditorModel).toSelf();
+        child.bind(merge_editor_panes_1.MergeEditorPaneHeader).toSelf().inTransientScope();
+        child.bind(merge_editor_panes_1.MergeEditorBasePane).toSelf();
+        child.bind(merge_editor_panes_1.MergeEditorSide1Pane).toSelf();
+        child.bind(merge_editor_panes_1.MergeEditorSide2Pane).toSelf();
+        child.bind(merge_editor_panes_1.MergeEditorResultPane).toSelf();
+        child.bind(browser_2.EditorWidget).toConstantValue(baseEditorWidget).whenInjectedInto(merge_editor_panes_1.MergeEditorBasePane);
+        child.bind(browser_2.EditorWidget).toConstantValue(side1EditorWidget).whenInjectedInto(merge_editor_panes_1.MergeEditorSide1Pane);
+        child.bind(browser_2.EditorWidget).toConstantValue(side2EditorWidget).whenInjectedInto(merge_editor_panes_1.MergeEditorSide2Pane);
+        child.bind(browser_2.EditorWidget).toConstantValue(resultEditorWidget).whenInjectedInto(merge_editor_panes_1.MergeEditorResultPane);
+        child.bind(merge_editor_1.MergeEditor).toSelf();
+        return child;
+    }
+}
+exports.MergeEditorFactory = MergeEditorFactory;
+//# sourceMappingURL=merge-editor-module.js.map

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

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

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

@@ -0,0 +1,122 @@
+import { Disposable, URI } from '@theia/core';
+import { ApplicationShell, BaseWidget, LabelProvider, Message, Navigatable, NavigatableWidgetOpenHandler, Saveable, SaveableSource, SplitPanel, StatefulWidget, StorageService, Widget, WidgetOpenerOptions } from '@theia/core/lib/browser';
+import { Observable } from '@theia/core/lib/common/observable';
+import { Range } from '@theia/editor/lib/browser';
+import { MergeRange } from './model/merge-range';
+import { MergeEditorModel } from './model/merge-editor-model';
+import { MergeEditorBasePane, MergeEditorPane, MergeEditorResultPane, MergeEditorSide1Pane, MergeEditorSide2Pane } from './view/merge-editor-panes';
+import { MergeEditorViewZoneComputer } from './view/merge-editor-view-zones';
+import { MergeEditorScrollSync } from './view/merge-editor-scroll-sync';
+export interface MergeUris {
+    baseUri: URI;
+    side1Uri: URI;
+    side2Uri: URI;
+    resultUri: URI;
+}
+export declare namespace MergeEditorUri {
+    function isMergeEditorUri(uri: URI): boolean;
+    function encode({ baseUri, side1Uri, side2Uri, resultUri }: MergeUris): URI;
+    function decode(uri: URI): MergeUris;
+}
+export type MergeEditorLayoutKind = 'mixed' | 'columns';
+export interface MergeEditorLayoutMode {
+    readonly kind: MergeEditorLayoutKind;
+    readonly showBase: boolean;
+    readonly showBaseAtTop: boolean;
+}
+export declare namespace MergeEditorLayoutMode {
+    const DEFAULT: MergeEditorLayoutMode;
+}
+export interface MergeEditorSideWidgetState {
+    title?: string;
+    description?: string;
+    detail?: string;
+}
+export interface MergeEditorWidgetState {
+    layoutMode?: MergeEditorLayoutMode;
+    side1State?: MergeEditorSideWidgetState;
+    side2State?: MergeEditorSideWidgetState;
+}
+export declare class MergeEditorSettings {
+    protected static LAYOUT_MODE: string;
+    protected readonly storageService: StorageService;
+    layoutMode: MergeEditorLayoutMode;
+    load(): Promise<void>;
+    save(): Promise<void>;
+}
+export declare class MergeEditor extends BaseWidget implements StatefulWidget, SaveableSource, Navigatable, ApplicationShell.TrackableWidgetProvider {
+    readonly model: MergeEditorModel;
+    readonly basePane: MergeEditorBasePane;
+    readonly side1Pane: MergeEditorSide1Pane;
+    readonly side2Pane: MergeEditorSide2Pane;
+    readonly resultPane: MergeEditorResultPane;
+    protected readonly viewZoneComputer: MergeEditorViewZoneComputer;
+    protected readonly settings: MergeEditorSettings;
+    protected readonly labelProvider: LabelProvider;
+    protected readonly visibilityObservable: Observable.Settable<boolean, void>;
+    protected readonly currentPaneObservable: Observable.Settable<MergeEditorPane | undefined, void>;
+    protected readonly layoutModeObservable: Observable.Settable<MergeEditorLayoutMode, void>;
+    protected readonly currentMergeRangeObservable: Observable<MergeRange | undefined, unknown>;
+    protected readonly selectionInBaseObservable: Observable<Range[] | undefined, unknown>;
+    protected verticalSplitPanel: SplitPanel;
+    protected horizontalSplitPanel: SplitPanel;
+    protected scrollSync: MergeEditorScrollSync;
+    protected init(): void;
+    protected createScrollSynchronizer(): MergeEditorScrollSync;
+    protected initCurrentPaneTracker(): void;
+    protected layoutInitialized: boolean;
+    protected ensureLayoutInitialized(): void;
+    protected doInitializeLayout(): void;
+    protected onLayoutInitialized(): void;
+    protected onResize(msg: Widget.ResizeMessage): void;
+    get isShown(): boolean;
+    get currentPane(): MergeEditorPane | undefined;
+    protected createCurrentMergeRangeObservable(): Observable<MergeRange | undefined>;
+    get currentMergeRange(): MergeRange | undefined;
+    protected createSelectionInBaseObservable(): Observable<Range[] | undefined>;
+    get selectionInBase(): Range[] | undefined;
+    get panes(): MergeEditorPane[];
+    get baseUri(): URI;
+    get side1Uri(): URI;
+    get side1Title(): string;
+    get side2Uri(): URI;
+    get side2Title(): string;
+    get resultUri(): URI;
+    storeState(): MergeEditorWidgetState;
+    restoreState(state: MergeEditorWidgetState): void;
+    get saveable(): Saveable;
+    getResourceUri(): URI | undefined;
+    createMoveToUri(resourceUri: URI): URI | undefined;
+    getTrackableWidgets(): Widget[];
+    goToFirstMergeRange(predicate?: (mergeRange: MergeRange) => boolean): void;
+    goToNextMergeRange(predicate?: (mergeRange: MergeRange) => boolean): void;
+    goToPreviousMergeRange(predicate?: (mergeRange: MergeRange) => boolean): void;
+    get layoutMode(): MergeEditorLayoutMode;
+    set layoutMode(value: MergeEditorLayoutMode);
+    get layoutKind(): MergeEditorLayoutKind;
+    set layoutKind(kind: MergeEditorLayoutKind);
+    get isShowingBase(): boolean;
+    get isShowingBaseAtTop(): boolean;
+    toggleShowBase(): void;
+    toggleShowBaseTop(): void;
+    toggleShowBaseCenter(): void;
+    get shouldAlignResult(): boolean;
+    get shouldAlignBase(): boolean;
+    protected applyLayoutMode(layoutMode: MergeEditorLayoutMode): void;
+    protected createViewZones(): Disposable;
+    protected onBeforeHide(msg: Message): void;
+    protected onAfterShow(msg: Message): void;
+    protected onActivateRequest(msg: Message): void;
+}
+export interface MergeEditorOpenerOptions extends WidgetOpenerOptions {
+    widgetState?: MergeEditorWidgetState;
+}
+export declare class MergeEditorOpenHandler extends NavigatableWidgetOpenHandler<MergeEditor> {
+    static readonly ID = "merge-editor-opener";
+    readonly id = "merge-editor-opener";
+    readonly label: string;
+    canHandle(uri: URI, options?: MergeEditorOpenerOptions): number;
+    open(uri: URI, options?: MergeEditorOpenerOptions): Promise<MergeEditor>;
+    protected getOrCreateWidget(uri: URI, options?: MergeEditorOpenerOptions): Promise<MergeEditor>;
+}
+//# sourceMappingURL=merge-editor.d.ts.map

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

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