fix microsoft/vscode#88413

Author: jrieken

package.json

@@ -3,7 +3,7 @@
   "displayName": "Reference Search View",
   "icon": "media/icon.png",
   "description": "Reference Search results as separate, stable view in the sidebar",
-  "version": "0.0.45",
+  "version": "0.0.46",
   "publisher": "ms-vscode",
   "engines": {
     "vscode": "^1.40.0"

src/extension.ts

@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 import { EditorHighlights } from './editorHighlights';
 import { History, HistoryItem } from './history';
-import { CallItem, CallsDirection, CallsModel, FileItem, getPreviewChunks, ItemSource, ReferenceItem, ReferencesModel, RichCallsDirection } from './models';
+import { CallItem, CallsDirection, CallsModel, FileItem, getPreviewChunks, getRequestRange, ItemSource, ReferenceItem, ReferencesModel, RichCallsDirection } from './models';
 import { TreeDataProviderWrapper, TreeItem } from './provider';
 
 export function activate(context: vscode.ExtensionContext) {
@@ -135,7 +135,7 @@ export function activate(context: vscode.ExtensionContext) {
         } else if (vscode.window.activeTextEditor) {
             // take args from active editor
             let editor = vscode.window.activeTextEditor;
-            if (editor.document.getWordRangeAtPosition(editor.selection.active)) {
+            if (getRequestRange(editor.document, editor.selection.active)) {
                 model = ReferencesModel.create(editor.document.uri, editor.selection.active, source);
             }
         }
@@ -166,7 +166,7 @@ export function activate(context: vscode.ExtensionContext) {
         } else if (vscode.window.activeTextEditor) {
             // take args from active editor
             let editor = vscode.window.activeTextEditor;
-            if (editor.document.getWordRangeAtPosition(editor.selection.active)) {
+            if (getRequestRange(editor.document, editor.selection.active)) {
                 model = new CallsModel(editor.document.uri, editor.selection.active, direction);
             }
         }

src/models.ts

@@ -6,6 +6,15 @@
 import * as vscode from 'vscode';
 import { HistoryItem } from './history';
 
+
+export function getRequestRange(doc: vscode.TextDocument, pos: vscode.Position): vscode.Range | undefined {
+    let range = doc.getWordRangeAtPosition(pos);
+    if (!range) {
+        range = doc.getWordRangeAtPosition(pos, /[^\s]+/);
+    }
+    return range;
+}
+
 export function getPreviewChunks(doc: vscode.TextDocument, range: vscode.Range, beforeLen: number = 8, trim: boolean = true) {
     let previewStart = range.start.with({ character: Math.max(0, range.start.character - beforeLen) });
     let wordRange = doc.getWordRangeAtPosition(previewStart);
@@ -109,7 +118,7 @@ export class ReferencesModel {
         } catch (e) {
             return;
         }
-        const range = doc.getWordRangeAtPosition(this.position);
+        const range = getRequestRange(doc, this.position);
         if (!range) {
             return;
         }