Align Ctrl+Click navigation flow with F12 for smoother and consistent definition jumps (#24)

Author: LeoAnders

src/ccs/commands/followDefinitionLink.ts

@@ -0,0 +1,32 @@
+import * as vscode from "vscode";
+
+import { lookupCcsDefinition } from "../features/definitionLookup/lookup";
+
+export async function followDefinitionLink(documentUri: string, line: number, character: number): Promise<void> {
+  if (!documentUri || typeof line !== "number" || typeof character !== "number") {
+    return;
+  }
+
+  const uri = vscode.Uri.parse(documentUri);
+  const document =
+    vscode.workspace.textDocuments.find((doc) => doc.uri.toString() === documentUri) ??
+    (await vscode.workspace.openTextDocument(uri));
+
+  const position = new vscode.Position(line, character);
+  const tokenSource = new vscode.CancellationTokenSource();
+
+  try {
+    const location = await lookupCcsDefinition(document, position, tokenSource.token);
+    if (location) {
+      await vscode.window.showTextDocument(location.uri, { selection: location.range });
+      return;
+    }
+
+    await vscode.window.showTextDocument(document, {
+      selection: new vscode.Range(position, position),
+    });
+    await vscode.commands.executeCommand("editor.action.revealDefinition");
+  } finally {
+    tokenSource.dispose();
+  }
+}

src/ccs/index.ts

@@ -14,6 +14,7 @@ export {
   type QueryKind,
 } from "./features/definitionLookup/extractQuery";
 export { goToDefinitionLocalFirst } from "./commands/goToDefinitionLocalFirst";
+export { followDefinitionLink } from "./commands/followDefinitionLink";
 export { PrioritizedDefinitionProvider } from "./providers/PrioritizedDefinitionProvider";
 export {
   DefinitionDocumentLinkProvider,

src/extension.ts

@@ -167,6 +167,7 @@ import {
   PrioritizedDefinitionProvider,
   DefinitionDocumentLinkProvider,
   followDefinitionLinkCommand,
+  followDefinitionLink,
   goToDefinitionLocalFirst,
   resolveContextExpression,
   showGlobalDocumentation,
@@ -1298,22 +1299,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
       followDefinitionLinkCommand,
       async (documentUri: string, line: number, character: number) => {
         sendCommandTelemetryEvent("ccs.followDefinitionLink");
-        if (!documentUri || typeof line !== "number" || typeof character !== "number") {
-          return;
-        }
-
-        const uri = vscode.Uri.parse(documentUri);
-        const document =
-          vscode.workspace.textDocuments.find((doc) => doc.uri.toString() === documentUri) ??
-          (await vscode.workspace.openTextDocument(uri));
-
-        const position = new vscode.Position(line, character);
-        const selectionRange = new vscode.Range(position, position);
-        const editor = await vscode.window.showTextDocument(document, { selection: selectionRange });
-        editor.selection = new vscode.Selection(position, position);
-        editor.revealRange(selectionRange);
-
-        await goToDefinitionLocalFirst();
+        await followDefinitionLink(documentUri, line, character);
       }
     ),
     vscode.commands.registerCommand("vscode-objectscript.debug", (program: string, askArgs: boolean) => {