have just one editor config listener #63467

microsoft · Nov 22, 2018 · 2448fa4 · 2448fa4
1 parent a0a6e48
commit 2448fa4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/src/vs/editor/contrib/codelens/codelensController.ts b/src/vs/editor/contrib/codelens/codelensController.ts
@@ -179,7 +179,13 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
 				this._disposeAllLenses(null, null);
 			}
 		}));
-
+		this._localToDispose.push(this._editor.onDidChangeConfiguration(e => {
+			if (e.fontInfo) {
+				for (const lens of this._lenses) {
+					lens.updateHeight();
+				}
+			}
+		}));
 		scheduler.schedule();
 	}
 

diff --git a/src/vs/editor/contrib/codelens/codelensWidget.ts b/src/vs/editor/contrib/codelens/codelensWidget.ts
@@ -6,7 +6,7 @@
 import 'vs/css!./codelensWidget';
 import * as dom from 'vs/base/browser/dom';
 import { coalesce, isFalsyOrEmpty } from 'vs/base/common/arrays';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable } from 'vs/base/common/lifecycle';
 import { escape, format } from 'vs/base/common/strings';
 import * as editorBrowser from 'vs/editor/browser/editorBrowser';
 import { Range } from 'vs/editor/common/core/range';
@@ -60,7 +60,7 @@ class CodeLensContentWidget implements editorBrowser.IContentWidget {
 
 	private readonly _id: string;
 	private readonly _domNode: HTMLElement;
-	private readonly _disposables: IDisposable[] = [];
+	private readonly _disposable: IDisposable;
 	private readonly _editor: editorBrowser.ICodeEditor;
 
 	private _widgetPosition: editorBrowser.IContentWidgetPosition;
@@ -82,11 +82,9 @@ class CodeLensContentWidget implements editorBrowser.IContentWidget {
 		this._domNode.innerHTML = '&nbsp;';
 		dom.addClass(this._domNode, 'codelens-decoration');
 		dom.addClass(this._domNode, 'invisible-cl');
-		this._updateHeight();
+		this.updateHeight();
 
-		this._disposables.push(this._editor.onDidChangeConfiguration(e => e.fontInfo && this._updateHeight()));
-
-		this._disposables.push(dom.addDisposableListener(this._domNode, 'click', e => {
+		this._disposable = dom.addDisposableListener(this._domNode, 'click', e => {
 			let element = <HTMLElement>e.target;
 			if (element.tagName === 'A' && element.id) {
 				let command = this._commands[element.id];
@@ -97,16 +95,16 @@ class CodeLensContentWidget implements editorBrowser.IContentWidget {
 					});
 				}
 			}
-		}));
+		});
 
 		this.updateVisibility();
 	}
 
 	dispose(): void {
-		dispose(this._disposables);
+		this._disposable.dispose();
 	}
 
-	private _updateHeight(): void {
+	updateHeight(): void {
 		const { fontInfo, lineHeight } = this._editor.getConfiguration();
 		this._domNode.style.height = `${Math.round(lineHeight * 1.1)}px`;
 		this._domNode.style.lineHeight = `${lineHeight}px`;
@@ -302,6 +300,10 @@ export class CodeLens {
 		this._contentWidget.withCommands(symbols);
 	}
 
+	updateHeight(): void {
+		this._contentWidget.updateHeight();
+	}
+
 	getLineNumber(): number {
 		const range = this._editor.getModel().getDecorationRange(this._decorationIds[0]);
 		if (range) {