From 358eb92d72a97dbbfb27d19baa200cca82e6cac6 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 3 May 2017 14:34:45 +0200
Subject: [PATCH] make sure default editor position is set, fixes #25801

---
 .../vscode-api-tests/src/window.test.ts       | 21 ++++++++++++++++++-
 .../workbench/api/node/extHostTextEditors.ts  |  2 ++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/extensions/vscode-api-tests/src/window.test.ts b/extensions/vscode-api-tests/src/window.test.ts
index 94a11bdff8e..cb14027e666 100644
--- a/extensions/vscode-api-tests/src/window.test.ts
+++ b/extensions/vscode-api-tests/src/window.test.ts
@@ -8,7 +8,7 @@
 import * as assert from 'assert';
 import { workspace, window, commands, ViewColumn, TextEditorViewColumnChangeEvent, Uri, Selection, Position, CancellationTokenSource, TextEditorSelectionChangeKind } from 'vscode';
 import { join } from 'path';
-import { cleanUp, pathEquals } from './utils';
+import { cleanUp, pathEquals, createRandomFile } from './utils';
 
 suite('window namespace tests', () => {
 
@@ -110,6 +110,25 @@ suite('window namespace tests', () => {
 		});
 	});
 
+	test('issue #25801 - default column when opening a file', async () => {
+		const [docA, docB, docC] = await Promise.all([
+			workspace.openTextDocument(await createRandomFile()),
+			workspace.openTextDocument(await createRandomFile()),
+			workspace.openTextDocument(await createRandomFile())
+		]);
+
+		await window.showTextDocument(docA, ViewColumn.One);
+		await window.showTextDocument(docB, ViewColumn.Two);
+
+		assert.ok(window.activeTextEditor);
+		assert.ok(window.activeTextEditor!.document === docB);
+		assert.equal(window.activeTextEditor!.viewColumn, ViewColumn.Two);
+
+		await window.showTextDocument(docC);
+		assert.ok(window.activeTextEditor!.document === docC);
+		assert.equal(window.activeTextEditor!.viewColumn, ViewColumn.One);
+	});
+
 	test('issue #5362 - Incorrect TextEditor passed by onDidChangeTextEditorSelection', (done) => {
 		const file10Path = join(workspace.rootPath || '', './10linefile.ts');
 		const file30Path = join(workspace.rootPath || '', './30linefile.ts');
diff --git a/src/vs/workbench/api/node/extHostTextEditors.ts b/src/vs/workbench/api/node/extHostTextEditors.ts
index 94003fbaa33..e95c96c3bba 100644
--- a/src/vs/workbench/api/node/extHostTextEditors.ts
+++ b/src/vs/workbench/api/node/extHostTextEditors.ts
@@ -14,6 +14,7 @@ import { IResolvedTextEditorConfiguration, ISelectionChangeEvent } from 'vs/work
 import * as TypeConverters from './extHostTypeConverters';
 import { TextEditorDecorationType, ExtHostTextEditor } from './extHostTextEditor';
 import { ExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors';
+import { Position as EditorPosition } from 'vs/platform/editor/common/editor';
 import { MainContext, MainThreadEditorsShape, ExtHostEditorsShape, ITextDocumentShowOptions, ITextEditorPositionData } from './extHost.protocol';
 import * as vscode from 'vscode';
 
@@ -74,6 +75,7 @@ export class ExtHostEditors extends ExtHostEditorsShape {
 			};
 		} else {
 			options = {
+				position: EditorPosition.ONE,
 				preserveFocus: false,
 				pinned: true
 			};