Scrolls to first conflict.

Author: hediet

src/vs/workbench/contrib/mergeEditor/browser/utils.ts

@@ -5,7 +5,7 @@
 
 import { CompareResult, ArrayQueue } from 'vs/base/common/arrays';
 import { BugIndicatingError } from 'vs/base/common/errors';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
 import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
 import { IModelDeltaDecoration } from 'vs/editor/common/model';
 import { IObservable, autorun } from 'vs/workbench/contrib/audioCues/browser/observable';
@@ -207,3 +207,16 @@ export function concatArrays<TArr extends any[]>(...arrays: TArr): TArr[number][
 export function elementAtOrUndefined<T>(arr: T[], index: number): T | undefined {
 	return arr[index];
 }
+
+export function thenIfNotDisposed<T>(promise: Promise<T>, then: () => void): IDisposable {
+	let disposed = false;
+	promise.then(() => {
+		if (disposed) {
+			return;
+		}
+		then();
+	});
+	return toDisposable(() => {
+		disposed = true;
+	});
+}

src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.ts

@@ -3,8 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/mergeEditor';
-import './colors';
 import { $, Dimension, reset } from 'vs/base/browser/dom';
 import { Direction, Grid, IView, SerializableGrid } from 'vs/base/browser/ui/grid/grid';
 import { Orientation, Sizing } from 'vs/base/browser/ui/splitview/splitview';
@@ -14,6 +12,7 @@ import { Color } from 'vs/base/common/color';
 import { BugIndicatingError } from 'vs/base/common/errors';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { URI } from 'vs/base/common/uri';
+import 'vs/css!./media/mergeEditor';
 import { ICodeEditor, isCodeEditor } from 'vs/editor/browser/editorBrowser';
 import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
 import { IEditorOptions as ICodeEditorOptions } from 'vs/editor/common/config/editorOptions';
@@ -38,15 +37,16 @@ import { EditorInput } from 'vs/workbench/common/editor/editorInput';
 import { applyTextEditorOptions } from 'vs/workbench/common/editor/editorOptions';
 import { autorunWithStore } from 'vs/workbench/contrib/audioCues/browser/observable';
 import { MergeEditorInput } from 'vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
-import { MergeEditorModel } from 'vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel';
 import { DocumentMapping, getOppositeDirection, MappingDirection } from 'vs/workbench/contrib/mergeEditor/browser/model/mapping';
-import { ReentrancyBarrier } from 'vs/workbench/contrib/mergeEditor/browser/utils';
+import { MergeEditorModel } from 'vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel';
+import { ReentrancyBarrier, thenIfNotDisposed } from 'vs/workbench/contrib/mergeEditor/browser/utils';
+import { MergeEditorViewModel } from 'vs/workbench/contrib/mergeEditor/browser/view/viewModel';
 import { settingsSashBorder } from 'vs/workbench/contrib/preferences/common/settingsEditorColorRegistry';
 import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import './colors';
 import { InputCodeEditorView } from './editors/inputCodeEditorView';
 import { ResultCodeEditorView } from './editors/resultCodeEditorView';
-import { MergeEditorViewModel } from 'vs/workbench/contrib/mergeEditor/browser/view/viewModel';
 
 export const ctxIsMergeEditor = new RawContextKey<boolean>('isMergeEditor', false);
 export const ctxUsesColumnLayout = new RawContextKey<boolean>('mergeEditorUsesColumnLayout', false);
@@ -235,6 +235,16 @@ export class MergeEditor extends AbstractTextEditor<any> {
 		this.inputResultView.setModel(viewModel, model.result, localize('result', 'Result',), this._labelService.getUriLabel(model.result.uri, { relative: true }), undefined);
 		this._ctxBaseResourceScheme.set(model.base.uri.scheme);
 
+		this._sessionDisposables.add(thenIfNotDisposed(model.onInitialized, () => {
+			const firstConflict = model.modifiedBaseRanges.get().find(r => r.isConflicting);
+			if (!firstConflict) {
+				return;
+			}
+
+			this.input1View.editor.revealLineInCenter(firstConflict.input1Range.startLineNumber);
+		}));
+
+
 		this._sessionDisposables.add(autorunWithStore((reader, store) => {
 			const input1ViewZoneIds: string[] = [];
 			const input2ViewZoneIds: string[] = [];