trending/codebase-memory-mcp
1
0
Fork 0
mirror of https://github.com/DeusData/codebase-memory-mcp.git synced 2026-10-27 06:53:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(java): resolve a package-qualified static-import class by short name

Browse Source 
`import static demo.Util.twice` records the import target package-qualified
("demo.Util"), but the class is registered under the project/directory QN
("<proj>.Util") when the `package` declaration and the file's directory differ
(e.g. a flat layout). java_lookup_method("demo.Util", ...) then missed, the call
fell through to the lsp_static_import_text fallback, and the precise
lsp_static_import strategy was absent.

On a miss, resolve the import's class by its short name against the registry and
retry the method lookup, preferring an in-module match. Mirrors the C++
short-name type fallback.

Signed-off-by: Martin Vogel <martin.vogel.tech@gmail.com>
This commit is contained in:
Martin Vogel
2026-06-28 12:34:15 +02:00
parent e6a46bd19c
commit 0366dfe70c
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/cbm/lsp/java_lsp.c
+22
View File
@@ -1963,6 +1963,28 @@ static void resolve_method_call(JavaLSPContext *ctx, TSNode call) {
continue;
char *cls = cbm_arena_strndup(ctx->arena, target, (size_t)(last_dot - target));
const CBMRegisteredFunc *f = java_lookup_method(ctx, cls, mname, arity);
if (!f && ctx->registry) {
/* The import is written package-qualified ("demo.Util"), but the
* class is registered under the project/directory QN
* ("<proj>.Util") when the `package` declaration and the file's
* directory differ. Resolve the import's class by its short name
* against the registry and retry — preferring an in-module match.
* Mirrors the C++ short-name type fallback. */
const char *cls_dot = strrchr(cls, '.');
const char *cls_short = cls_dot ? cls_dot + 1 : cls;
size_t sl = strlen(cls_short);
for (int ti = 0; ti < ctx->registry->type_count && !f; ti++) {
const char *q = ctx->registry->types[ti].qualified_name;
if (!q) {
continue;
}
size_t ql = strlen(q);
if (ql > sl + 1 && q[ql - sl - 1] == '.' &&
strcmp(q + ql - sl, cls_short) == 0) {
f = java_lookup_method(ctx, q, mname, arity);
}
}
}
if (f) {
java_emit_resolved(ctx, f->qualified_name, "lsp_static_import", 0.92f);
return;