Fix 'super' must be called before accessing 'this' in Configuration

alexdima · alexdima · commit ec3673e21c62 · 2016-02-23T14:19:11.000+01:00
diff --git a/src/vs/editor/browser/config/configuration.ts b/src/vs/editor/browser/config/configuration.ts
@@ -269,12 +269,8 @@ export class Configuration extends CommonEditorConfiguration {
 		}
 	}
 
-	private _elementSizeObserver: ElementSizeObserver;
-
 	constructor(options:any, referenceDomElement:HTMLElement = null, indentationGuesser:(tabSize:number)=>IGuessedIndentation = null) {
-		this._elementSizeObserver = new ElementSizeObserver(referenceDomElement, () => this._onReferenceDomElementSizeChanged());
-
-		super(options, indentationGuesser);
+		super(options, new ElementSizeObserver(referenceDomElement, () => this._onReferenceDomElementSizeChanged()), indentationGuesser);
 
 		this._register(CSSBasedConfiguration.INSTANCE.onDidChange(() => () => this._onCSSBasedConfigurationChanged()));
 
diff --git a/src/vs/editor/browser/config/elementSizeObserver.ts b/src/vs/editor/browser/config/elementSizeObserver.ts
@@ -6,8 +6,9 @@
 
 import {Disposable} from 'vs/base/common/lifecycle';
 import {IDimension} from 'vs/editor/common/editorCommon';
+import {IElementSizeObserver} from 'vs/editor/common/config/commonEditorConfig';
 
-export class ElementSizeObserver extends Disposable {
+export class ElementSizeObserver extends Disposable implements IElementSizeObserver {
 
 	private referenceDomElement:HTMLElement;
 	private measureReferenceDomElementToken:number;
diff --git a/src/vs/editor/common/config/commonEditorConfig.ts b/src/vs/editor/common/config/commonEditorConfig.ts
@@ -550,13 +550,22 @@ export interface IIndentationGuesser {
 	(tabSize:number): editorCommon.IGuessedIndentation;
 }
 
+export interface IElementSizeObserver {
+	startObserving(): void;
+	observe(dimension?:editorCommon.IDimension): void;
+	dispose(): void;
+	getWidth(): number;
+	getHeight(): number;
+}
+
 export abstract class CommonEditorConfiguration extends Disposable implements editorCommon.IConfiguration {
 
 	public handlerDispatcher:editorCommon.IHandlerDispatcher;
 	public editor:editorCommon.IInternalEditorOptions;
 	public editorClone:editorCommon.IInternalEditorOptions;
 
 	protected _configWithDefaults:ConfigurationWithDefaults;
+	protected _elementSizeObserver: IElementSizeObserver;
 	private _indentationGuesser:IIndentationGuesser;
 	private _cachedGuessedIndentationTabSize: number;
 	private _cachedGuessedIndentation:editorCommon.IGuessedIndentation;
@@ -566,9 +575,10 @@ export abstract class CommonEditorConfiguration extends Disposable implements ed
 	private _onDidChange = this._register(new Emitter<editorCommon.IConfigurationChangedEvent>());
 	public onDidChange: Event<editorCommon.IConfigurationChangedEvent> = this._onDidChange.event;
 
-	constructor(options:any, indentationGuesser:IIndentationGuesser = null) {
+	constructor(options:any, elementSizeObserver: IElementSizeObserver = null, indentationGuesser:IIndentationGuesser = null) {
 		super();
 		this._configWithDefaults = new ConfigurationWithDefaults(options);
+		this._elementSizeObserver = elementSizeObserver;
 		this._indentationGuesser = indentationGuesser;
 		this._cachedGuessedIndentationTabSize = -1;
 		this._cachedGuessedIndentation = null;

Original file line number	Diff line number	Diff line change
`@@ -269,12 +269,8 @@ export class Configuration extends CommonEditorConfiguration {`
`269`	`269`	`}`
`270`	`270`	`}`
`271`	`271`
`272`		`- private _elementSizeObserver: ElementSizeObserver;`
`273`		`-`
`274`	`272`	`constructor(options:any, referenceDomElement:HTMLElement = null, indentationGuesser:(tabSize:number)=>IGuessedIndentation = null) {`
`275`		`- this._elementSizeObserver = new ElementSizeObserver(referenceDomElement, () => this._onReferenceDomElementSizeChanged());`
`276`		`-`
`277`		`- super(options, indentationGuesser);`
	`273`	`+ super(options, new ElementSizeObserver(referenceDomElement, () => this._onReferenceDomElementSizeChanged()), indentationGuesser);`
`278`	`274`
`279`	`275`	`this._register(CSSBasedConfiguration.INSTANCE.onDidChange(() => () => this._onCSSBasedConfigurationChanged()));`
`280`	`276`