Fixes microsoft/monaco-editor#1378: Convert view coordinates to model coordinates in getTargetAtClientPoint

alexdima · alexdima · commit b6142df5b474 · 2019-12-16T22:33:09.000+01:00
diff --git a/src/vs/editor/browser/view/viewImpl.ts b/src/vs/editor/browser/view/viewImpl.ts
@@ -460,7 +460,11 @@ export class View extends ViewEventHandler {
 	}
 
 	public getTargetAtClientPoint(clientX: number, clientY: number): IMouseTarget | null {
-		return this.pointerHandler.getTargetAtClientPoint(clientX, clientY);
+		const mouseTarget = this.pointerHandler.getTargetAtClientPoint(clientX, clientY);
+		if (!mouseTarget) {
+			return null;
+		}
+		return ViewOutgoingEvents.convertViewToModelMouseTarget(mouseTarget, this._context.model.coordinatesConverter);
 	}
 
 	public createOverviewRuler(cssClassName: string): OverviewRuler {
diff --git a/src/vs/editor/browser/view/viewOutgoingEvents.ts b/src/vs/editor/browser/view/viewOutgoingEvents.ts
@@ -11,7 +11,7 @@ import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { IScrollEvent } from 'vs/editor/common/editorCommon';
 import * as viewEvents from 'vs/editor/common/view/viewEvents';
-import { IViewModel } from 'vs/editor/common/viewModel/viewModel';
+import { IViewModel, ICoordinatesConverter } from 'vs/editor/common/viewModel/viewModel';
 import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
 
 export interface EventCallback<T> {
@@ -132,23 +132,19 @@ export class ViewOutgoingEvents extends Disposable {
 	}
 
 	private _convertViewToModelMouseTarget(target: IMouseTarget): IMouseTarget {
+		return ViewOutgoingEvents.convertViewToModelMouseTarget(target, this._viewModel.coordinatesConverter);
+	}
+
+	public static convertViewToModelMouseTarget(target: IMouseTarget, coordinatesConverter: ICoordinatesConverter): IMouseTarget {
 		return new ExternalMouseTarget(
 			target.element,
 			target.type,
 			target.mouseColumn,
-			target.position ? this._convertViewToModelPosition(target.position) : null,
-			target.range ? this._convertViewToModelRange(target.range) : null,
+			target.position ? coordinatesConverter.convertViewPositionToModelPosition(target.position) : null,
+			target.range ? coordinatesConverter.convertViewRangeToModelRange(target.range) : null,
 			target.detail
 		);
 	}
-
-	private _convertViewToModelPosition(viewPosition: Position): Position {
-		return this._viewModel.coordinatesConverter.convertViewPositionToModelPosition(viewPosition);
-	}
-
-	private _convertViewToModelRange(viewRange: Range): Range {
-		return this._viewModel.coordinatesConverter.convertViewRangeToModelRange(viewRange);
-	}
 }
 
 class ExternalMouseTarget implements IMouseTarget {

Original file line number	Diff line number	Diff line change
`@@ -460,7 +460,11 @@ export class View extends ViewEventHandler {`
`460`	`460`	`}`
`461`	`461`
`462`	`462`	`public getTargetAtClientPoint(clientX: number, clientY: number): IMouseTarget \| null {`
`463`		`- return this.pointerHandler.getTargetAtClientPoint(clientX, clientY);`
	`463`	`+ const mouseTarget = this.pointerHandler.getTargetAtClientPoint(clientX, clientY);`
	`464`	`+ if (!mouseTarget) {`
	`465`	`+ return null;`
	`466`	`+ }`
	`467`	`+ return ViewOutgoingEvents.convertViewToModelMouseTarget(mouseTarget, this._context.model.coordinatesConverter);`
`464`	`468`	`}`
`465`	`469`
`466`	`470`	`public createOverviewRuler(cssClassName: string): OverviewRuler {`