Select symbol of other references results (#4336)

Author: michelleangela

Extension/src/LanguageServer/references.ts

@@ -373,7 +373,7 @@ export class ReferencesManager {
             }
         } else {
             // Put results in data model
-            this.findAllRefsView.setData(referencesResult.referenceInfos, this.referencesCanceled);
+            this.findAllRefsView.setData(referencesResult, this.referencesCanceled);
 
             // Display data based on command mode: peek references OR find all references
             if (this.client.ReferencesCommandMode === ReferencesCommandMode.Peek) {

Extension/src/LanguageServer/referencesModel.ts

@@ -4,15 +4,17 @@
  * ------------------------------------------------------------------------------------------ */
 'use strict';
 import * as vscode from 'vscode';
-import { ReferenceType, ReferenceInfo } from './references';
+import { ReferenceType, ReferenceInfo, ReferencesResult } from './references';
 
 export class Model {
     readonly FileItems: FileItem[] = [];
     readonly ReferenceItems: ReferenceItem[] = [];
     readonly ReferenceTypeItems: ReferenceTypeItem[] = [];
+    private originalSymbol: string = "";
 
-    constructor(resultsInput: ReferenceInfo[]) {
-        let results: ReferenceInfo[] = resultsInput.filter(r => r.type !== ReferenceType.Confirmed);
+    constructor(resultsInput: ReferencesResult) {
+        this.originalSymbol = resultsInput.text;
+        let results: ReferenceInfo[] = resultsInput.referenceInfos.filter(r => r.type !== ReferenceType.Confirmed);
         for (let r of results) {
             // Add file if it doesn't exist
             let fileItem: FileItem;
@@ -46,7 +48,7 @@ export class Model {
             fileItem.ReferenceItemsPending = noReferenceLocation;
             fileItemByRef.ReferenceItemsPending = noReferenceLocation;
             if (!noReferenceLocation) {
-                const range: vscode.Range = new vscode.Range(r.position.line, r.position.character, r.position.line, r.position.character + 1);
+                const range: vscode.Range = new vscode.Range(r.position.line, r.position.character, r.position.line, r.position.character + this.originalSymbol.length);
                 const location: vscode.Location = new vscode.Location(fileItem.uri, range);
                 const reference: ReferenceItem = new ReferenceItem(r.position, location, r.text, fileItem, r.type);
 

Extension/src/LanguageServer/referencesProvider.ts

@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 import * as util from '../common';
 import { Model, FileItem, ReferenceItem, ReferenceTypeItem } from './referencesModel';
-import { ReferenceInfo, ReferenceType, getReferenceTagString } from './references';
+import { ReferencesResult, ReferenceType, getReferenceTagString } from './references';
 import * as nls from 'vscode-nls';
 
 nls.config({ messageFormat: nls.MessageFormat.bundle, bundleFormat: nls.BundleFormat.standalone })();
@@ -66,7 +66,7 @@ export class ReferenceDataProvider implements vscode.TreeDataProvider<TreeObject
         this._onDidChangeTreeData.fire();
     }
 
-    setModel(results: ReferenceInfo[], isCanceled: boolean): void {
+    setModel(results: ReferencesResult, isCanceled: boolean): void {
         this.referencesCanceled = isCanceled;
         this.references = new Model(results);
         this._onDidChangeTreeData.fire();

Extension/src/LanguageServer/referencesView.ts

@@ -4,7 +4,7 @@
  * ------------------------------------------------------------------------------------------ */
 'use strict';
 import * as vscode from 'vscode';
-import { ReferenceInfo, ReferenceType, getReferenceTagString } from './references';
+import { ReferencesResult, ReferenceType, getReferenceTagString } from './references';
 import { ReferenceDataProvider } from './referencesProvider';
 import { FileItem, ReferenceItem } from './referencesModel';
 
@@ -29,7 +29,7 @@ export class FindAllRefsView {
         this.referenceViewProvider.toggleGroupView();
     }
 
-    setData(results: ReferenceInfo[], isCanceled: boolean): void {
+    setData(results: ReferencesResult, isCanceled: boolean): void {
         this.referenceViewProvider.setModel(results, isCanceled);
     }