Merge pull request microsoft#158869 from microsoft/aiday/issue158813

When several definitions found, reveal the position then reveal definitions

Author: jrieken

src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts

@@ -46,6 +46,7 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 	private _hoverOnLine: number;
 	private _hoverOnColumn: number;
 	private _stickyRangeProjectedOnEditor: IRange | null;
+	private _candidateDefinitionsLength: number;
 
 	constructor(
 		private readonly _editor: ICodeEditor,
@@ -62,6 +63,7 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 		this._hoverOnLine = -1;
 		this._hoverOnColumn = -1;
 		this._stickyRangeProjectedOnEditor = null;
+		this._candidateDefinitionsLength = -1;
 		this._lineHeight = this._editor.getOption(EditorOption.lineHeight);
 		this._register(this._editor.onDidChangeConfiguration(e => {
 			if (e.hasChanged(EditorOption.lineHeight)) {
@@ -113,6 +115,7 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 						return;
 					}
 					if (candidateDefinitions.length !== 0) {
+						this._candidateDefinitionsLength = candidateDefinitions.length;
 						const childHTML: HTMLElement = targetMouseEvent.element;
 						if (currentHTMLChild !== childHTML) {
 							sessionStore.clear();
@@ -140,16 +143,19 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 			sessionStore.clear();
 		}));
 		linkGestureStore.add(gesture.onExecute(async e => {
-			if (this._hoverOnLine !== -1) {
-				if (e.hasTriggerModifier) {
-					// Control click
-					this._instaService.invokeFunction(goToDefinitionWithLocation, e, this._editor as IActiveCodeEditor, { uri: this._editor.getModel()!.uri, range: this._stickyRangeProjectedOnEditor } as Location);
-				} else {
-					// Normal click
+			if ((e.target as unknown as CustomMouseEvent).detail !== this.getId()) {
+				return;
+			}
+			if (e.hasTriggerModifier) {
+				// Control click
+				if (this._candidateDefinitionsLength > 1) {
 					this._editor.revealPosition({ lineNumber: this._hoverOnLine, column: 1 });
 				}
+				this._instaService.invokeFunction(goToDefinitionWithLocation, e, this._editor as IActiveCodeEditor, { uri: this._editor.getModel()!.uri, range: this._stickyRangeProjectedOnEditor } as Location);
+			} else {
+				// Normal click
+				this._editor.revealPosition({ lineNumber: this._hoverOnLine, column: 1 });
 			}
-
 		}));
 		return linkGestureStore;
 	}