diff --git a/src/vs/workbench/browser/parts/editor/baseEditor.ts b/src/vs/workbench/browser/parts/editor/baseEditor.ts
index 86ac02805bcc0632f2f8e003c412b029cfe8a151..e5b104932143f85bbd9f5aadf93a87ff26d3ee23 100644
--- a/src/vs/workbench/browser/parts/editor/baseEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/baseEditor.ts
@@ -67,7 +67,7 @@ export abstract class BaseEditor extends Panel implements IEditor {
 	 * Sets the given input with the options to the part. An editor has to deal with the
 	 * situation that the same input is being set with different options.
 	 */
-	public setInput(input: EditorInput, options: EditorOptions): TPromise<void> {
+	public setInput(input: EditorInput, options?: EditorOptions): TPromise<void> {
 		this._input = input;
 		this._options = options;
 
diff --git a/src/vs/workbench/browser/parts/editor/binaryDiffEditor.ts b/src/vs/workbench/browser/parts/editor/binaryDiffEditor.ts
index c518a3053e817c9b0ef8d4392acdba8739efeded..ac659ca648077636f67954f565d0096a2128c31b 100644
--- a/src/vs/workbench/browser/parts/editor/binaryDiffEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/binaryDiffEditor.ts
@@ -91,7 +91,7 @@ export class BinaryResourceDiffEditor extends BaseEditor implements IVerticalSas
 		$(this.rightScrollbar.getDomNode()).addClass('binarydiff-right');
 	}
 
-	public setInput(input: EditorInput, options: EditorOptions): TPromise<void> {
+	public setInput(input: EditorInput, options?: EditorOptions): TPromise<void> {
 		const oldInput = this.getInput();
 		super.setInput(input, options);
 
diff --git a/src/vs/workbench/browser/parts/editor/binaryEditor.ts b/src/vs/workbench/browser/parts/editor/binaryEditor.ts
index ccf777af156153e71e5a8c3d33367bb8a7c89932..3475c8b1d0ba207d5c4b7f63a5f6dd9845aa882f 100644
--- a/src/vs/workbench/browser/parts/editor/binaryEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/binaryEditor.ts
@@ -57,7 +57,7 @@ export abstract class BaseBinaryResourceEditor extends BaseEditor {
 		parent.getHTMLElement().appendChild(this.scrollbar.getDomNode());
 	}
 
-	public setInput(input: EditorInput, options: EditorOptions): TPromise<void> {
+	public setInput(input: EditorInput, options?: EditorOptions): TPromise<void> {
 		const oldInput = this.getInput();
 		super.setInput(input, options);
 
diff --git a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
index 207765239bc5767985dc19651a334283c40fc59c..891261f534516b0eb16fb313aa441f1bbb6c9a11 100644
--- a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
@@ -47,7 +47,7 @@ export class SideBySideEditor extends BaseEditor {
 		this.createSash(parentElement);
 	}
 
-	public setInput(newInput: SideBySideEditorInput, options: EditorOptions): TPromise<void> {
+	public setInput(newInput: SideBySideEditorInput, options?: EditorOptions): TPromise<void> {
 		const oldInput = <SideBySideEditorInput>this.getInput();
 		return super.setInput(newInput, options)
 			.then(() => this.updateInput(oldInput, newInput, options));
@@ -86,7 +86,7 @@ export class SideBySideEditor extends BaseEditor {
 		return null;
 	}
 
-	private updateInput(oldInput: SideBySideEditorInput, newInput: SideBySideEditorInput, options: EditorOptions): TPromise<void> {
+	private updateInput(oldInput: SideBySideEditorInput, newInput: SideBySideEditorInput, options?: EditorOptions): TPromise<void> {
 		if (!newInput.matches(oldInput)) {
 			if (oldInput) {
 				this.disposeEditors();
@@ -94,19 +94,19 @@ export class SideBySideEditor extends BaseEditor {
 			this.createEditorContainers();
 			return this.setNewInput(newInput, options);
 		} else {
-			this.detailsEditor.setInput(newInput.details, new EditorOptions());
+			this.detailsEditor.setInput(newInput.details);
 			this.masterEditor.setInput(newInput.master, options);
 		}
 	}
 
-	private setNewInput(newInput: SideBySideEditorInput, options: EditorOptions): TPromise<void> {
+	private setNewInput(newInput: SideBySideEditorInput, options?: EditorOptions): TPromise<void> {
 		return TPromise.join([
-			this._createEditor(<EditorInput>newInput.details, this.detailsEditorContainer, new EditorOptions()), //TODO@ben why do you have to provide options
+			this._createEditor(<EditorInput>newInput.details, this.detailsEditorContainer),
 			this._createEditor(<EditorInput>newInput.master, this.masterEditorContainer, options)
 		]).then(result => this.onEditorsCreated(result[0], result[1]));
 	}
 
-	private _createEditor(editorInput: EditorInput, container: HTMLElement, options: EditorOptions): TPromise<BaseEditor> {
+	private _createEditor(editorInput: EditorInput, container: HTMLElement, options?: EditorOptions): TPromise<BaseEditor> {
 		const descriptor = Registry.as<IEditorRegistry>(EditorExtensions.Editors).getEditor(editorInput);
 		if (!descriptor) {
 			return TPromise.wrapError(new Error(strings.format('Can not find a registered editor for the input {0}', editorInput)));
diff --git a/src/vs/workbench/browser/parts/editor/stringEditor.ts b/src/vs/workbench/browser/parts/editor/stringEditor.ts
index dbe016509b4ca150baa578ae0b98dff6775c2d75..94cec6107341fd440f3c383d7230963ed2fb914c 100644
--- a/src/vs/workbench/browser/parts/editor/stringEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/stringEditor.ts
@@ -68,7 +68,7 @@ export class StringEditor extends BaseTextEditor {
 		return nls.localize('textEditor', "Text Editor");
 	}
 
-	public setInput(input: EditorInput, options: EditorOptions): TPromise<void> {
+	public setInput(input: EditorInput, options?: EditorOptions): TPromise<void> {
 		const oldInput = this.getInput();
 		super.setInput(input, options);
 
diff --git a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
index 842473fcfdb84ce4f5cc3cf3c9f1c844e63eafd3..2bf250674902068fda60d9768b1c3b3c4970a514 100644
--- a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
@@ -117,7 +117,7 @@ export class TextDiffEditor extends BaseTextEditor {
 		return diffEditorInstantiator.createInstance(DiffEditorWidget, parent.getHTMLElement(), this.getCodeEditorOptions());
 	}
 
-	public setInput(input: EditorInput, options: EditorOptions): TPromise<void> {
+	public setInput(input: EditorInput, options?: EditorOptions): TPromise<void> {
 		const oldInput = this.getInput();
 		super.setInput(input, options);
 
diff --git a/src/vs/workbench/browser/parts/editor/textEditor.ts b/src/vs/workbench/browser/parts/editor/textEditor.ts
index f4f22bbb0f64581cf1f9702d594b73b606c22b35..3f3d0bcd45398e5f36c9e46f38c64aed1c88f1fc 100644
--- a/src/vs/workbench/browser/parts/editor/textEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textEditor.ts
@@ -142,7 +142,7 @@ export abstract class BaseTextEditor extends BaseEditor {
 		return this.instantiationService.createInstance(CodeEditor, parent.getHTMLElement(), this.getCodeEditorOptions());
 	}
 
-	public setInput(input: EditorInput, options: EditorOptions): TPromise<void> {
+	public setInput(input: EditorInput, options?: EditorOptions): TPromise<void> {
 		return super.setInput(input, options).then(() => {
 			this.editorControl.updateOptions(this.getCodeEditorOptions()); // support input specific editor options
 		});
diff --git a/src/vs/workbench/parts/debug/browser/debugErrorEditor.ts b/src/vs/workbench/parts/debug/browser/debugErrorEditor.ts
index 5e0e6fb250bc2081593bdbad641b85c1a5429400..48c92a21b4d5783a16382d7929025e820ab7a34d 100644
--- a/src/vs/workbench/parts/debug/browser/debugErrorEditor.ts
+++ b/src/vs/workbench/parts/debug/browser/debugErrorEditor.ts
@@ -29,7 +29,7 @@ export class DebugErrorEditor extends BaseEditor {
 		this.container.style.height = `${dimension.height}px`;
 	}
 
-	public setInput(input: DebugErrorEditorInput, options: EditorOptions): TPromise<void> {
+	public setInput(input: DebugErrorEditorInput, options?: EditorOptions): TPromise<void> {
 		this.container.textContent = input.value;
 		return super.setInput(input, options);
 	}
diff --git a/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts b/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
index 8675cae05869b3f7bf9ba232c714c99558afb585..53203230338099f8c98b44ab7a7a0a836446e19c 100644
--- a/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
+++ b/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
@@ -83,7 +83,7 @@ export class TextFileEditor extends BaseTextEditor {
 		return <FileEditorInput>super.getInput();
 	}
 
-	public setInput(input: FileEditorInput, options: EditorOptions): TPromise<void> {
+	public setInput(input: FileEditorInput, options?: EditorOptions): TPromise<void> {
 		const oldInput = this.getInput();
 		super.setInput(input, options);
 
diff --git a/src/vs/workbench/parts/html/browser/htmlPreviewPart.ts b/src/vs/workbench/parts/html/browser/htmlPreviewPart.ts
index 03e4e08d0586a69acef8e777faecb741a5de52e4..3e5f39fb59e06502fd3f467a981a5f0162afcf55 100644
--- a/src/vs/workbench/parts/html/browser/htmlPreviewPart.ts
+++ b/src/vs/workbench/parts/html/browser/htmlPreviewPart.ts
@@ -138,7 +138,7 @@ export class HtmlPreviewPart extends BaseEditor {
 		this.webview.focus();
 	}
 
-	public setInput(input: EditorInput, options: EditorOptions): TPromise<void> {
+	public setInput(input: EditorInput, options?: EditorOptions): TPromise<void> {
 
 		if (this.input === input && this._hasValidModel()) {
 			return TPromise.as(undefined);
diff --git a/src/vs/workbench/parts/output/browser/outputPanel.ts b/src/vs/workbench/parts/output/browser/outputPanel.ts
index 9da095b094e129de6776b5aee8e9bfd91f0a75ae..61ad052eb13e384095fb1c9d2ce09e7761306141 100644
--- a/src/vs/workbench/parts/output/browser/outputPanel.ts
+++ b/src/vs/workbench/parts/output/browser/outputPanel.ts
@@ -98,7 +98,7 @@ export class OutputPanel extends StringEditor {
 		return options;
 	}
 
-	public setInput(input: EditorInput, options: EditorOptions): TPromise<void> {
+	public setInput(input: EditorInput, options?: EditorOptions): TPromise<void> {
 		return super.setInput(input, options).then(() => this.revealLastLine());
 	}