fix microsoft#41298

jrieken · jrieken · commit 1a0cce8e54d1 · 2018-01-08T15:28:06.000-08:00
diff --git a/src/vs/editor/contrib/referenceSearch/referencesController.ts b/src/vs/editor/contrib/referenceSearch/referencesController.ts
@@ -19,19 +19,20 @@ import { IStorageService } from 'vs/platform/storage/common/storage';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { ReferencesModel, OneReference } from './referencesModel';
+import { ReferencesModel } from './referencesModel';
 import { ReferenceWidget, LayoutData } from './referencesWidget';
 import { Range } from 'vs/editor/common/core/range';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { Position } from 'vs/editor/common/core/position';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { Location } from 'vs/editor/common/modes';
 
 export const ctxReferenceSearchVisible = new RawContextKey<boolean>('referenceSearchVisible', false);
 
 export interface RequestOptions {
 	getMetaTitle(model: ReferencesModel): string;
-	onGoto?: (reference: OneReference) => TPromise<any>;
+	onGoto?: (reference: Location) => TPromise<any>;
 }
 
 export class ReferencesController implements editorCommon.IEditorContribution {
@@ -189,7 +190,7 @@ export class ReferencesController implements editorCommon.IEditorContribution {
 		this._requestIdPool += 1; // Cancel pending requests
 	}
 
-	private _gotoReference(ref: OneReference): void {
+	private _gotoReference(ref: Location): void {
 		this._widget.hide();
 
 		this._ignoreModelChangeEvent = true;
@@ -222,7 +223,7 @@ export class ReferencesController implements editorCommon.IEditorContribution {
 		});
 	}
 
-	private _openReference(ref: OneReference, sideBySide: boolean): void {
+	private _openReference(ref: Location, sideBySide: boolean): void {
 		const { uri, range } = ref;
 		this._editorService.openEditor({
 			resource: uri,
diff --git a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts
@@ -42,6 +42,7 @@ import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import URI from 'vs/base/common/uri';
 import { TrackedRangeStickiness, IModelDeltaDecoration } from 'vs/editor/common/model';
+import { Location } from 'vs/editor/common/modes';
 
 class DecorationsManager implements IDisposable {
 
@@ -558,7 +559,7 @@ export interface LayoutData {
 export interface SelectionEvent {
 	kind: 'goto' | 'show' | 'side' | 'open';
 	source: 'editor' | 'tree' | 'title';
-	element: OneReference;
+	element: Location;
 }
 
 /**
@@ -783,11 +784,12 @@ export class ReferenceWidget extends PeekViewWidget {
 		this._disposeOnNewModel.push(this._model.onDidChangeReferenceRange(reference => this._tree.refresh(reference)));
 
 		// listen on editor
-		this._disposeOnNewModel.push(this._preview.onMouseDown((e) => {
-			if (e.event.detail === 2) {
+		this._disposeOnNewModel.push(this._preview.onMouseDown(e => {
+			const { event, target } = e;
+			if (event.detail === 2) {
 				this._onDidSelectReference.fire({
-					element: this._getFocusedReference(),
-					kind: (e.event.ctrlKey || e.event.metaKey) ? 'side' : 'open',
+					element: { uri: this._getFocusedReference().uri, range: target.range },
+					kind: (event.ctrlKey || event.metaKey) ? 'side' : 'open',
 					source: 'editor'
 				});
 			}
