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; /** * Creates an editor widget backed by an empty in-memory resource. * Used as a fallback when the base URI cannot be resolved, e.g. in BOTH_ADDED * merge conflicts where there is no common ancestor (git index stage 1). */ protected createEmptyFallbackEditorWidget(originalUri: URI, disposables: DisposableCollection): Promise; protected createEditorWidget(uri: URI, disposables: DisposableCollection): Promise; 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