renames

Author: jrieken

src/calls/index.ts

@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { ContextKey } from '../models';
 import { SymbolsTree } from '../tree';
+import { ContextKey } from '../utils';
 import { CallItem, CallsDirection, CallsTreeInput } from './model';
 
 export function register(tree: SymbolsTree, context: vscode.ExtensionContext): void {

src/calls/model.ts

@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode';
 import { SymbolItemEditorHighlights, SymbolItemNavigation, SymbolTreeInput, SymbolTreeModel } from '../api';
-import { del, tail } from '../models';
+import { del, tail } from '../utils';
 
 
 export class CallsTreeInput implements SymbolTreeInput {

src/editorHighlights.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { CallItem, CallsModel, FileItem, ReferencesModel } from './models';
+import { CallItem, CallsModel, FileItem, ReferencesModel } from './utils';
 
 export class EditorHighlights {
 

src/extension.ts

@@ -9,9 +9,9 @@ import * as calls from './calls';
 import { EditorHighlights } from './editorHighlights';
 import { History, HistoryItem } from './history';
 import * as locations from './locations';
-import { CallItem, CallsDirection, CallsModel, Context, FileItem, getPreviewChunks, getRequestRange, ItemSource, ReferenceItem, ReferencesModel, RichCallsDirection } from './models';
 import { CallItemDataProvider, HistoryDataProvider, ReferencesProvider, TreeDataProviderWrapper } from './provider';
 import { SymbolsTree } from './tree';
+import { CallItem, CallsDirection, CallsModel, Context, FileItem, getPreviewChunks, getRequestRange, ItemSource, ReferenceItem, ReferencesModel, RichCallsDirection } from './utils';
 
 export function activate(context: vscode.ExtensionContext) {
 

src/history.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { Context } from './models';
+import { Context } from './utils';
 
 export class WordAnchor {
 

src/locations/model.ts

@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode';
 import { SymbolItemEditorHighlights, SymbolItemNavigation, SymbolTreeInput, SymbolTreeModel } from '../api';
-import { del, getPreviewChunks, prefixLen, tail } from '../models';
+import { del, getPreviewChunks, prefixLen, tail } from '../utils';
 
 export class LocationTreeInput implements SymbolTreeInput {
 

src/navigation.ts

@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode';
 import { SymbolItemNavigation } from './api';
-import { ContextKey } from './models';
+import { ContextKey } from './utils';
 
 export class Navigation {
 

src/provider.ts

@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode';
 import { History, HistoryItem } from './history';
-import { CallItem as CallHierarchyItem, CallsModel, FileItem, getPreviewChunks, ReferenceItem, ReferencesModel } from './models';
+import { CallItem as CallHierarchyItem, CallsModel, FileItem, getPreviewChunks, ReferenceItem, ReferencesModel } from './utils';
 
 export class ReferencesProvider implements vscode.TreeDataProvider<FileItem | ReferenceItem> {
 

src/tree.ts

@@ -7,8 +7,8 @@ import * as vscode from 'vscode';
 import { SymbolTreeInput } from './api';
 import { EditorHighlights } from './highlights';
 import { WordAnchor } from './history';
-import { ContextKey } from './models';
 import { Navigation } from './navigation';
+import { ContextKey, isValidRequestPosition } from './utils';
 
 export class SymbolsTree {
 
@@ -46,6 +46,11 @@ export class SymbolsTree {
 
 	async setInput(input: SymbolTreeInput) {
 
+		if (!await isValidRequestPosition(input.uri, input.position)) {
+			this._resetInput();
+			return;
+		}
+
 		this._ctxInputSource.set(input.contextValue);
 		this._ctxIsActive.set(true);
 		this._ctxHasResult.set(true);
@@ -69,8 +74,7 @@ export class SymbolsTree {
 		}
 
 		if (model.empty) {
-			this.clearInput();
-			this._tree.message = this._history.size === 0 ? 'No results.' : 'No results. Try running a previous search again:';
+			this._resetInput();
 			return;
 		}
 
@@ -119,6 +123,11 @@ export class SymbolsTree {
 			this._tree.message = 'No results.';
 		}
 	}
+
+	private _resetInput() {
+		this.clearInput();
+		this._tree.message = this._history.size === 0 ? 'No results.' : 'No results. Try running a previous search again:';
+	}
 }
 
 // --- tree data

src/models.ts renamed to src/utils.ts

@@ -25,6 +25,15 @@ export function prefixLen(a: string, b: string): number {
     return pos;
 }
 
+export async function isValidRequestPosition(uri: vscode.Uri, position: vscode.Position) {
+    const doc = await vscode.workspace.openTextDocument(uri);
+    let range = doc.getWordRangeAtPosition(position);
+    if (!range) {
+        range = doc.getWordRangeAtPosition(position, /[^\s]+/);
+    }
+    return Boolean(range);
+}
+
 export function getRequestRange(doc: vscode.TextDocument, pos: vscode.Position): vscode.Range | undefined {
     let range = doc.getWordRangeAtPosition(pos);
     if (!range) {