Fixes #24712: remove code that tries to preserve editor options, but is incorrect

src/vs/workbench/common/editor.ts

@@ -10,12 +10,11 @@ import * as objects from 'vs/base/common/objects';
 import types = require('vs/base/common/types');
 import URI from 'vs/base/common/uri';
 import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
-import { IEditor, ICommonCodeEditor, IEditorViewState, IModel } from 'vs/editor/common/editorCommon';
+import { IEditor, IEditorViewState, IModel } from 'vs/editor/common/editorCommon';
 import { IEditorInput, IEditorModel, IEditorOptions, ITextEditorOptions, IBaseResourceInput, Position, Verbosity } from 'vs/platform/editor/common/editor';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { IInstantiationService, IConstructorSignature0 } from 'vs/platform/instantiation/common/instantiation';
 import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import * as editorOptions from 'vs/editor/common/config/editorOptions';
 
 export const TextCompareEditorVisible = new RawContextKey<boolean>('textCompareEditorVisible', false);
 
@@ -586,7 +585,6 @@ export class TextEditorOptions extends EditorOptions {
 
 	private revealInCenterIfOutsideViewport: boolean;
 	private editorViewState: IEditorViewState;
-	private editorOptions: editorOptions.IEditorOptions;
 
 	public static from(input: IBaseResourceInput): TextEditorOptions {
 		let options: TextEditorOptions = null;
@@ -691,17 +689,6 @@ export class TextEditorOptions extends EditorOptions {
 		// View state
 		options.editorViewState = editor.saveViewState();
 
-		// Selected editor options
-		const codeEditor = <ICommonCodeEditor>editor;
-		if (typeof codeEditor.getConfiguration === 'function') {
-			const config = codeEditor.getConfiguration();
-			if (config && config.viewInfo && config.wrappingInfo) {
-				options.editorOptions = Object.create(null);
-				options.editorOptions.renderWhitespace = config.viewInfo.renderWhitespace;
-				options.editorOptions.renderControlCharacters = config.viewInfo.renderControlCharacters;
-				options.editorOptions.wordWrap = config.wrappingInfo.isViewportWrapping ? 'on' : 'off';
-			}
-		}
 		return options;
 	}
 
@@ -712,11 +699,6 @@ export class TextEditorOptions extends EditorOptions {
 	 */
 	public apply(editor: IEditor): boolean {
 
-		// Editor options
-		if (this.editorOptions) {
-			editor.updateOptions(this.editorOptions);
-		}
-
 		// View state
 		return this.applyViewState(editor);
 	}