Revert "Fix unified definition navigation and Ctrl+Click local resolution (#32)"

package.json

@@ -538,6 +538,11 @@
         }
       ],
       "editor/title": [
+        {
+          "command": "vscode-objectscript.ccs.goToDefinition",
+          "group": "navigation@0",
+          "when": "editorTextFocus && editorLangId =~ /^objectscript/"
+        },
         {
           "command": "-editor.action.revealDefinition",
           "group": "navigation@0",

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/commands/goToDefinitionLocalFirst.ts

@@ -0,0 +1,26 @@
+import * as vscode from "vscode";
+
+import { lookupCcsDefinition } from "../features/definitionLookup/lookup";
+
+export async function goToDefinitionLocalFirst(): Promise<void> {
+  const editor = vscode.window.activeTextEditor;
+  if (!editor) {
+    return;
+  }
+
+  const { document, selection } = editor;
+  const position = selection.active;
+  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;
+    }
+  } finally {
+    tokenSource.dispose();
+  }
+
+  await vscode.commands.executeCommand("editor.action.revealDefinition");
+}

src/ccs/index.ts

@@ -13,9 +13,8 @@ export {
   type QueryMatch,
   type QueryKind,
 } from "./features/definitionLookup/extractQuery";
-export { goToDefinitionLocalFirst } from "./commands/navigation/goToDefinitionLocalFirst";
-export { followDefinitionLink } from "./commands/navigation/followDefinitionLink";
-export { navigateToDefinition, type NavigateOpts } from "./commands/navigation/navigateDefinition";
+export { goToDefinitionLocalFirst } from "./commands/goToDefinitionLocalFirst";
+export { followDefinitionLink } from "./commands/followDefinitionLink";
 export { PrioritizedDefinitionProvider } from "./providers/PrioritizedDefinitionProvider";
 export {
   DefinitionDocumentLinkProvider,