Fix regex for getting citation keys

Was only working with the first citation key on a line
notZaki · Dec 11, 2021 · a3cb2a0 · a3cb2a0
1 parent 09b9f1e
commit a3cb2a0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/providers/definition.ts b/src/providers/definition.ts
@@ -1,5 +1,6 @@
 import * as vscode from 'vscode';
 import { Extension } from '../extension';
+import * as fs from 'fs';
 
 export class DefinitionProvider implements vscode.DefinitionProvider {
 	extension: Extension;
@@ -10,15 +11,15 @@ export class DefinitionProvider implements vscode.DefinitionProvider {
 
 	provideDefinition(document: vscode.TextDocument, position: vscode.Position): vscode.Location | undefined {
 		// look for an @ at the start of the current word (start) and the end of the current word or line (end)
-		const startResult = document.getText(new vscode.Range(new vscode.Position(position.line, 0), position)).match(/[\b@]/);
+		const startResult = document.getText(new vscode.Range(new vscode.Position(position.line, 0), position)).match(/[\b@]\w*$/);
 		const endResult = document.getText(new vscode.Range(position, new vscode.Position(position.line, 65535))).match(/$|\s/);
 		if (startResult === null || endResult === null ||
 			startResult.index === undefined || endResult.index === undefined ||
 			startResult.index < 0 || endResult.index < 0) {
 			return undefined;
 		}
 
-		const invoker = startResult[0];
+		const invoker = startResult[0][0];
 		if (invoker !== '@') { return; }
 
 		const line = document.getText(new vscode.Range(
@@ -27,7 +28,10 @@ export class DefinitionProvider implements vscode.DefinitionProvider {
 		)).trim()
 		const cite = this.extension.completer.citation.getEntry(line);
 		if (cite) {
+			// return new vscode.Location(vscode.Uri.parse(`zotero://select/items/bbt:{cite.key}`), new vscode.Position(0,0));
+			// vscode.env.openExternal(vscode.Uri.parse(`zotero://select/items/bbt:${cite.key}`));
 			return new vscode.Location( vscode.Uri.file(cite.file), cite.position )
+			// zotero://select/items/bbt:turingComputableNumbersApplication1937
 		}
 	}
 }
diff --git a/src/providers/hover.ts b/src/providers/hover.ts
@@ -11,15 +11,15 @@ export class HoverProvider implements vscode.HoverProvider {
 	public async provideHover(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken): Promise<vscode.Hover | undefined> {
 
 		// look for an @ at the start of the current word (start) and the end of the current word or line (end)
-		const startResult = document.getText(new vscode.Range(new vscode.Position(position.line, 0), position)).match(/[\b@]/);
+		const startResult = document.getText(new vscode.Range(new vscode.Position(position.line, 0), position)).match(/[\b@]\w*$/);
 		const endResult = document.getText(new vscode.Range(position, new vscode.Position(position.line, 65535))).match(/$|\s/);
 		if (startResult === null || endResult === null ||
 			startResult.index === undefined || endResult.index === undefined ||
 			startResult.index < 0 || endResult.index < 0) {
 			return undefined;
 		}
 
-		const invoker = startResult[0];
+		const invoker = startResult[0][0];
 		if (invoker !== '@') { return; }
 
 		const line = document.getText(new vscode.Range(