From 8692734a1b88a8e73045a739bb91589e8bb73eb9 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Fri, 2 Dec 2016 17:37:28 +0100
Subject: [PATCH] #16394 Polishing

---
 .../browser/parts/editor/sideBySideEditor.ts  | 27 ++++++++++---------
 src/vs/workbench/common/editor.ts             |  2 +-
 .../common/editor/diffEditorInput.ts          |  4 +++
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
index 17db9ca86dd..207765239bc 100644
--- a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
@@ -41,7 +41,7 @@ export class SideBySideEditor extends BaseEditor {
 		super(SideBySideEditor.ID, telemetryService);
 	}
 
-	public createEditor(parent: Builder) {
+	public createEditor(parent: Builder): void {
 		const parentElement = parent.getHTMLElement();
 		DOM.addClass(parentElement, 'side-by-side-editor');
 		this.createSash(parentElement);
@@ -63,24 +63,27 @@ export class SideBySideEditor extends BaseEditor {
 		super.setEditorVisible(visible, position);
 	}
 
-	public clearInput() {
+	public clearInput(): void {
 		this.disposeEditors();
 		super.clearInput();
 	}
 
-	public focus() {
+	public focus(): void {
 		if (this.masterEditor) {
 			this.masterEditor.focus();
 		}
 	}
 
-	public layout(dimension: Dimension) {
+	public layout(dimension: Dimension): void {
 		this.dimension = dimension;
 		this.sash.setDimenesion(this.dimension);
 	}
 
 	public getControl(): IEditorControl {
-		return this.masterEditor.getControl();
+		if (this.masterEditor) {
+			return this.masterEditor.getControl();
+		}
+		return null;
 	}
 
 	private updateInput(oldInput: SideBySideEditorInput, newInput: SideBySideEditorInput, options: EditorOptions): TPromise<void> {
@@ -111,19 +114,19 @@ export class SideBySideEditor extends BaseEditor {
 		return this.instantiationService.createInstance(<EditorDescriptor>descriptor)
 			.then((editor: BaseEditor) => {
 				editor.create(new Builder(container));
-				editor.setInput(editorInput, options);
-				return editor;
+				return editor.setInput(editorInput, options).then(() => editor);
 			});
 	}
 
-	private onEditorsCreated(details: BaseEditor, master: BaseEditor) {
+	private onEditorsCreated(details: BaseEditor, master: BaseEditor): void {
 		this.detailsEditor = details;
 		this.masterEditor = master;
-		this.setVisible(this.isVisible());
+		this.setEditorVisible(this.isVisible(), this.position);
 		this.dolayout(this.sash.getVerticalSashLeft());
+		this.focus();
 	}
 
-	private createEditorContainers() {
+	private createEditorContainers(): void {
 		const parentElement = this.getContainer().getHTMLElement();
 		this.detailsEditorContainer = DOM.append(parentElement, DOM.$('.details-editor-container'));
 		this.detailsEditorContainer.style.position = 'absolute';
@@ -136,7 +139,7 @@ export class SideBySideEditor extends BaseEditor {
 		this._register(this.sash.onPositionChange(position => this.dolayout(position)));
 	}
 
-	private dolayout(splitPoint: number) {
+	private dolayout(splitPoint: number): void {
 		if (!this.detailsEditor || !this.masterEditor) {
 			return;
 		}
@@ -155,7 +158,7 @@ export class SideBySideEditor extends BaseEditor {
 		this.masterEditor.layout(new Dimension(masterEditorWidth, this.dimension.height));
 	}
 
-	private disposeEditors() {
+	private disposeEditors(): void {
 		const parentContainer = this.getContainer().getHTMLElement();
 		if (this.detailsEditor) {
 			this.detailsEditor.dispose();
diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts
index 408e2fea0b0..2d87cfe1641 100644
--- a/src/vs/workbench/common/editor.ts
+++ b/src/vs/workbench/common/editor.ts
@@ -365,7 +365,7 @@ export class SideBySideEditorInput extends EditorInput {
 
 	private _toUnbind: IDisposable[];
 
-	constructor(private name: string, private description: string, private _details: EditorInput, private _master: EditorInput, protected forceOpenAsBinary?: boolean) {
+	constructor(private name: string, private description: string, private _details: EditorInput, private _master: EditorInput) {
 		super();
 		this._toUnbind = [];
 		this.registerListeners();
diff --git a/src/vs/workbench/common/editor/diffEditorInput.ts b/src/vs/workbench/common/editor/diffEditorInput.ts
index c29d5be7dc6..8e01b6cb032 100644
--- a/src/vs/workbench/common/editor/diffEditorInput.ts
+++ b/src/vs/workbench/common/editor/diffEditorInput.ts
@@ -23,6 +23,10 @@ export class DiffEditorInput extends SideBySideEditorInput {
 
 	private cachedModel: DiffEditorModel;
 
+	constructor(name: string, description: string, original: EditorInput, modified: EditorInput, private forceOpenAsBinary?: boolean) {
+		super(name, description, original, modified);
+	}
+
 	public getTypeId(): string {
 		return DiffEditorInput.ID;
 	}
-- 
GitLab