use editor mouse listener instead of multiple listeners #63467

src/vs/editor/contrib/codelens/codelensController.ts

@@ -186,6 +186,17 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
 				}
 			}
 		}));
+		this._localToDispose.push(this._editor.onMouseUp(e => {
+			if (e.target.type === editorBrowser.MouseTargetType.CONTENT_WIDGET && e.target.element.tagName === 'A') {
+				for (const lens of this._lenses) {
+					let command = lens.getCommand(e.target.element as HTMLLinkElement);
+					if (command) {
+						this._commandService.executeCommand(command.id, ...command.arguments).catch(err => this._notificationService.error(err));
+						break;
+					}
+				}
+			}
+		}));
 		scheduler.schedule();
 	}
 
@@ -242,7 +253,7 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
 						groupsIndex++;
 						codeLensIndex++;
 					} else {
-						this._lenses.splice(codeLensIndex, 0, new CodeLens(groups[groupsIndex], this._editor, helper, accessor, this._commandService, this._notificationService, () => this._detectVisibleLenses.schedule()));
+						this._lenses.splice(codeLensIndex, 0, new CodeLens(groups[groupsIndex], this._editor, helper, accessor, () => this._detectVisibleLenses.schedule()));
 						codeLensIndex++;
 						groupsIndex++;
 					}
@@ -256,7 +267,7 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
 
 				// Create extra symbols
 				while (groupsIndex < groups.length) {
-					this._lenses.push(new CodeLens(groups[groupsIndex], this._editor, helper, accessor, this._commandService, this._notificationService, () => this._detectVisibleLenses.schedule()));
+					this._lenses.push(new CodeLens(groups[groupsIndex], this._editor, helper, accessor, () => this._detectVisibleLenses.schedule()));
 					groupsIndex++;
 				}
 

src/vs/editor/contrib/codelens/codelensWidget.ts

@@ -6,7 +6,6 @@
 import 'vs/css!./codelensWidget';
 import * as dom from 'vs/base/browser/dom';
 import { coalesce, isFalsyOrEmpty } from 'vs/base/common/arrays';
-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';
@@ -15,8 +14,6 @@ import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 import { Command, ICodeLensSymbol } from 'vs/editor/common/modes';
 import { editorCodeLensForeground } from 'vs/editor/common/view/editorColorRegistry';
 import { ICodeLensData } from 'vs/editor/contrib/codelens/codelens';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { INotificationService } from 'vs/platform/notification/common/notification';
 import { editorActiveLinkForeground } from 'vs/platform/theme/common/colorRegistry';
 import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 
@@ -60,7 +57,6 @@ class CodeLensContentWidget implements editorBrowser.IContentWidget {
 
 	private readonly _id: string;
 	private readonly _domNode: HTMLElement;
-	private readonly _disposable: IDisposable;
 	private readonly _editor: editorBrowser.ICodeEditor;
 
 	private _widgetPosition: editorBrowser.IContentWidgetPosition;
@@ -68,11 +64,8 @@ class CodeLensContentWidget implements editorBrowser.IContentWidget {
 
 	constructor(
 		editor: editorBrowser.ICodeEditor,
-		symbolRange: Range,
-		commandService: ICommandService,
-		notificationService: INotificationService
+		symbolRange: Range
 	) {
-
 		this._id = 'codeLensWidget' + (++CodeLensContentWidget._idPool);
 		this._editor = editor;
 
@@ -83,27 +76,9 @@ class CodeLensContentWidget implements editorBrowser.IContentWidget {
 		dom.addClass(this._domNode, 'codelens-decoration');
 		dom.addClass(this._domNode, 'invisible-cl');
 		this.updateHeight();
-
-		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];
-				if (command) {
-					editor.focus();
-					commandService.executeCommand(command.id, ...command.arguments).then(undefined, err => {
-						notificationService.error(err);
-					});
-				}
-			}
-		});
-
 		this.updateVisibility();
 	}
 
-	dispose(): void {
-		this._disposable.dispose();
-	}
-
 	updateHeight(): void {
 		const { fontInfo, lineHeight } = this._editor.getConfiguration();
 		this._domNode.style.height = `${Math.round(lineHeight * 1.1)}px`;
@@ -146,6 +121,12 @@ class CodeLensContentWidget implements editorBrowser.IContentWidget {
 		this._editor.layoutContentWidget(this);
 	}
 
+	getCommand(link: HTMLLinkElement): Command | undefined {
+		return link.parentElement === this._domNode
+			? this._commands[link.id]
+			: undefined;
+	}
+
 	getId(): string {
 		return this._id;
 	}
@@ -219,8 +200,7 @@ export class CodeLens {
 		editor: editorBrowser.ICodeEditor,
 		helper: CodeLensHelper,
 		viewZoneChangeAccessor: editorBrowser.IViewZoneChangeAccessor,
-		commandService: ICommandService, notificationService: INotificationService,
-		updateCallabck: Function
+		updateCallback: Function
 	) {
 		this._editor = editor;
 		this._data = data;
@@ -242,8 +222,8 @@ export class CodeLens {
 			}
 		});
 
-		this._contentWidget = new CodeLensContentWidget(editor, range, commandService, notificationService);
-		this._viewZone = new CodeLensViewZone(range.startLineNumber - 1, updateCallabck);
+		this._contentWidget = new CodeLensContentWidget(editor, range);
+		this._viewZone = new CodeLensViewZone(range.startLineNumber - 1, updateCallback);
 
 		this._viewZoneId = viewZoneChangeAccessor.addZone(this._viewZone);
 		this._editor.addContentWidget(this._contentWidget);
@@ -257,8 +237,6 @@ export class CodeLens {
 			viewZoneChangeAccessor.removeZone(this._viewZoneId);
 		}
 		this._editor.removeContentWidget(this._contentWidget);
-
-		this._contentWidget.dispose();
 	}
 
 	isValid(): boolean {
@@ -304,6 +282,10 @@ export class CodeLens {
 		this._contentWidget.updateHeight();
 	}
 
+	getCommand(link: HTMLLinkElement): Command | undefined {
+		return this._contentWidget.getCommand(link);
+	}
+
 	getLineNumber(): number {
 		const range = this._editor.getModel().getDecorationRange(this._decorationIds[0]);
 		if (range) {