fix(language-server): gate api hover to actual api.<name> references
Quality / quality (ubuntu-latest) (push) Failing after 9m55s
Quality / quality (windows-latest) (push) Canceled after 0s

Hover fired on whatever word was under the cursor, so a local variable
colliding with a declared block name reported the block's method and path
instead of its own hover info. Completion was already gated this way.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
2026-08-20 19:03:46 +05:30
co-authored by Claude Opus 5
parent e944fd4496
commit 5429057a38
4 changed files with 57 additions and 5 deletions
+16 -1
View File
@@ -103,6 +103,18 @@ function isApiCallPosition(text: string, offset: number): boolean {
return /\bapi\.\w*$/.test(before);
}
/**
* True when the identifier containing `offset` is the `<name>` of an `api.<name>`
* reference. Hover fires on whatever word is under the cursor, so without this a local
* variable that merely collides with a block name would report the block's method and
* path instead of its own hover info.
*/
export function isApiReferenceAt(text: string, offset: number): boolean {
let start = offset;
while (start > 0 && /\w/.test(text[start - 1]!)) start--;
return /\bapi\.$/.test(text.slice(0, start));
}
type JsonRpc = { jsonrpc?: string; id?: number | string; method?: string; params?: any };
const documents = new Map<string, TextDocument>();
const diagnosticTimers = new Map<string, ReturnType<typeof setTimeout>>();
@@ -311,7 +323,10 @@ async function handle(message: JsonRpc): Promise<void> {
case "textDocument/hover": {
const document = documents.get(params.textDocument.uri);
const word = document ? wordAt(document.text, params.position)?.word : undefined;
const apiHover = word ? apiCallHover(document!.text, word) : undefined;
const apiHover =
word && isApiReferenceAt(document!.text, offsetAt(document!.text, params.position))
? apiCallHover(document!.text, word)
: undefined;
if (apiHover) {
result(message.id, { contents: apiHover });
break;
@@ -1,5 +1,5 @@
import { expect, test } from "bun:test";
import { apiCallCompletions, apiCallHover } from "../src/server.ts";
import { apiCallCompletions, apiCallHover, isApiReferenceAt } from "../src/server.ts";
const SOURCE = `page Search {
apis {
@@ -71,3 +71,32 @@ test("an ssr {} data block, which the parser now rejects with a ParseError, stil
expect(() => apiCallCompletions(legacy)).not.toThrow();
expect(apiCallCompletions(legacy)).toEqual([]);
});
test("a bare identifier that merely collides with a block name is not an api reference", () => {
// `searchUsers` here is a local variable, not `api.searchUsers` -- hovering it must
// not report the API block's method and path.
const source = `page Search {
apis {
searchUsers POST /api/users {
response { return data.users }
}
}
functions {
client function go() {
const searchUsers = 1
void api.searchUsers({ name: "x" })
return searchUsers
}
}
view { <main>x</main> }
}
`;
const collision = source.indexOf("const searchUsers") + "const ".length;
const reference = source.indexOf("searchUsers POST");
expect(isApiReferenceAt(source, collision)).toBe(false);
expect(isApiReferenceAt(source, source.indexOf("api.searchUsers") + 4)).toBe(true);
expect(reference).toBeGreaterThan(-1);
});