Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode'

lib/vscode/extensions/merge-conflict/src/interfaces.ts

@@ -0,0 +1,48 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import * as vscode from 'vscode';
+
+export interface IMergeRegion {
+	name: string;
+	header: vscode.Range;
+	content: vscode.Range;
+	decoratorContent: vscode.Range;
+}
+
+export const enum CommitType {
+	Current,
+	Incoming,
+	Both
+}
+
+export interface IExtensionConfiguration {
+	enableCodeLens: boolean;
+	enableDecorations: boolean;
+	enableEditorOverview: boolean;
+}
+
+export interface IDocumentMergeConflict extends IDocumentMergeConflictDescriptor {
+	commitEdit(type: CommitType, editor: vscode.TextEditor, edit?: vscode.TextEditorEdit): Thenable<boolean>;
+	applyEdit(type: CommitType, document: vscode.TextDocument, edit: { replace(range: vscode.Range, newText: string): void; }): void;
+}
+
+export interface IDocumentMergeConflictDescriptor {
+	range: vscode.Range;
+	current: IMergeRegion;
+	incoming: IMergeRegion;
+	commonAncestors: IMergeRegion[];
+	splitter: vscode.Range;
+}
+
+export interface IDocumentMergeConflictTracker {
+	getConflicts(document: vscode.TextDocument): PromiseLike<IDocumentMergeConflict[]>;
+	isPending(document: vscode.TextDocument): boolean;
+	forget(document: vscode.TextDocument): void;
+}
+
+export interface IDocumentMergeConflictTrackerService {
+	createTracker(origin: string): IDocumentMergeConflictTracker;
+	forget(document: vscode.TextDocument): void;
+}