Revealing the line before invoking the functions when there are several possible definitions

Author: aiday-mar

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();
@@ -143,11 +146,17 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 			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);
+					if (this._candidateDefinitionsLength === 1) {
+						this._instaService.invokeFunction(goToDefinitionWithLocation, e, this._editor as IActiveCodeEditor, { uri: this._editor.getModel()!.uri, range: this._stickyRangeProjectedOnEditor } as Location);
+					} else {
+						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 });
 				}
+				this._hoverOnLine = -1;
 			}
 
 		}));
@@ -274,6 +283,12 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 				this._hoverOnColumn = this._editor.getModel().getLineContent(line).indexOf(text) + 1 || -1;
 			}
 		}));
+		this._disposableStore.add(dom.addDisposableListener(child, 'mouseout', () => {
+			if (this._editor.hasModel()) {
+				this._hoverOnLine = -1;
+				this._hoverOnColumn = -1;
+			}
+		}));
 
 		return child;
 	}