simplify inputs

Author: jrieken

src/api.d.ts

@@ -30,7 +30,6 @@ export interface SymbolTreeInput {
 	readonly title: string;
 	readonly uri: vscode.Uri;
 	readonly position: vscode.Position;
-	readonly hash: string;
 
 	resolve(): Promise<SymbolTreeModel>;
 	with(position: vscode.Position): SymbolTreeInput;

src/calls/model.ts

@@ -12,7 +12,6 @@ export class CallsTreeInput implements SymbolTreeInput {
 
 	readonly title: string;
 	readonly contextValue: string = 'callHierarchy';
-	readonly hash: string;
 
 	constructor(
 		readonly uri: vscode.Uri,
@@ -22,7 +21,6 @@ export class CallsTreeInput implements SymbolTreeInput {
 		this.title = direction === CallsDirection.Incoming
 			? 'Callers Of'
 			: 'Calls From';
-		this.hash = JSON.stringify([this.uri, this.position, this.direction]);
 	}
 
 	async resolve() {

src/extension.ts

@@ -170,7 +170,7 @@ function activate2(context: vscode.ExtensionContext) {
 
 	const refindCommand = (item: HistoryItem) => {
 		if (item instanceof HistoryItem) {
-			vscode.commands.executeCommand(item.commandId, ...[...item.extraArgs, item.uri, item.anchor.getPosition()]);
+			vscode.commands.executeCommand(item.commandId, ...[...item.extraArgs, item.uri, item.anchor.guessedTrackedPosition()]);
 		}
 	};
 
@@ -250,7 +250,7 @@ function activate2(context: vscode.ExtensionContext) {
 
 		} else if (arg instanceof HistoryItem) {
 			uri = arg.uri;
-			pos = arg.anchor.getPosition();
+			pos = arg.anchor.guessedTrackedPosition();
 			preserveFocus = false;
 		}
 

src/history.ts

@@ -21,7 +21,7 @@ export class WordAnchor {
         return range && doc.getText(range);
     }
 
-    getPosition(): vscode.Position | undefined {
+    guessedTrackedPosition(): vscode.Position | undefined {
         // funky entry
         if (!this._word) {
             return this._position;

src/locations/model.ts

@@ -10,7 +10,6 @@ import { del, getPreviewChunks, prefixLen, tail } from '../utils';
 export class LocationTreeInput implements SymbolTreeInput {
 
 	readonly contextValue: string;
-	readonly hash: string;
 
 	constructor(
 		readonly title: string,
@@ -19,7 +18,6 @@ export class LocationTreeInput implements SymbolTreeInput {
 		private readonly _command: string,
 	) {
 		this.contextValue = _command;
-		this.hash = JSON.stringify([this.uri, this.position, this._command]);
 	}
 
 	async resolve() {

src/tree.ts

@@ -193,6 +193,7 @@ class HistoryItem {
 	readonly description: string;
 
 	constructor(
+		readonly key: string,
 		readonly word: string,
 		readonly anchor: WordAnchor,
 		readonly input: SymbolTreeInput,
@@ -208,7 +209,7 @@ class TreeInputHistory implements vscode.TreeDataProvider<HistoryItem>{
 
 	private readonly _disposables: vscode.Disposable[] = [];
 	private readonly _ctxHasHistory = new ContextKey<boolean>('reference-list.hasHistory');
-	private readonly _inputs = new Map<string, Thenable<HistoryItem>>();
+	private readonly _inputs = new Map<string, HistoryItem>();
 
 	constructor(private readonly _tree: SymbolsTree) {
 
@@ -223,16 +224,15 @@ class TreeInputHistory implements vscode.TreeDataProvider<HistoryItem>{
 					this._reRunHistoryItem(item);
 				}
 			}),
-			vscode.commands.registerCommand('references-view.refresh', async () => {
-				const input = this._tree.getInput();
-				const item = this._inputs.get(input?.hash ?? '');
+			vscode.commands.registerCommand('references-view.refresh', () => {
+				const [item] = this._inputs.values();
 				if (item) {
-					this._reRunHistoryItem(await item);
+					this._reRunHistoryItem(item);
 				}
 			}),
 			vscode.commands.registerCommand('_references-view.showHistoryItem', (item) => {
 				if (item instanceof HistoryItem) {
-					const position = item.anchor.getPosition() ?? item.input.position;
+					const position = item.anchor.guessedTrackedPosition() ?? item.input.position;
 					return vscode.commands.executeCommand('vscode.open', item.input.uri, { selection: new vscode.Range(position, position) });
 				}
 			}),
@@ -260,24 +260,23 @@ class TreeInputHistory implements vscode.TreeDataProvider<HistoryItem>{
 	}
 
 	private _reRunHistoryItem(item: HistoryItem): void {
-		this._inputs.delete(item.input.hash);
-		const newInput = item.input.with(item.anchor.getPosition() ?? item.input.position);
+		this._inputs.delete(item.key);
+		const newInput = item.input.with(item.anchor.guessedTrackedPosition() ?? item.input.position);
 		this._tree.setInput(newInput);
 	}
 
-	add(input: SymbolTreeInput): void {
+	async add(input: SymbolTreeInput) {
 
-		const p = vscode.workspace.openTextDocument(input.uri).then(doc => {
-			const anchor = new WordAnchor(doc, input.position);
-			const range = doc.getWordRangeAtPosition(input.position) ?? doc.getWordRangeAtPosition(input.position, /[^\s]+/);
-			const word = range ? doc.getText(range) : '???';
-			return new HistoryItem(word, anchor, input);
-		});
+		const doc = await vscode.workspace.openTextDocument(input.uri);
+
+		const anchor = new WordAnchor(doc, input.position);
+		const range = doc.getWordRangeAtPosition(input.position) ?? doc.getWordRangeAtPosition(input.position, /[^\s]+/);
+		const word = range ? doc.getText(range) : '???';
 
+		const item = new HistoryItem(JSON.stringify([range?.start ?? input.position, input.uri, input.title]), word, anchor, input);
 		// use filo-ordering of native maps
-		const key = input.hash;
-		this._inputs.delete(key);
-		this._inputs.set(key, p);
+		this._inputs.delete(item.key);
+		this._inputs.set(item.key, item);
 		this._ctxHasHistory.set(true);
 	}