fix(resolution): Java/Kotlin imports disambiguate same-name classes (#314) (#472)

A Maven multi-module project where `dao/converter/FooConverter` and
`service/converter/FooConverter` both expose a `convert` method used to
resolve by file-path proximity — picking whichever class was closer to
the caller, which is wrong any time the caller lives in an equidistant
cross-cutting module. `extractImportMappings` had no Java branch at all,
so the FQN signal Java imports carry — `import
com.example.dao.converter.FooConverter;` — was thrown away.

- `extractJavaImports` parses regular and `import static` directives;
  wildcard imports (`*`) are intentionally skipped.
- `resolveViaImport` has a new Java/Kotlin cross-file branch that
  converts the imported FQN to a file-path suffix
  (`com/example/dao/converter/FooConverter.java`, or `.kt`) and
  resolves the symbol against the file whose path matches by suffix.
- For the field-receiver pattern (`@Autowired private FooConverter
  fooConverter; fooConverter.convert(...)`), `matchMethodCall` now
  looks up the receiver's inferred type in the caller file's imports
  and threads the resulting FQN through to `resolveMethodOnType`.
  When two `FooConverter::convert` candidates exist, the import — not
  iteration order — picks the right one.

Validated with a synthetic 3-module repro: swapping only the import
line on the caller swaps the resolved target between dao and service.

spring-petclinic (47 .java files): +15 newly import-resolved edges,
+2 references, no regression elsewhere.

Closes #314.
This commit is contained in:
Colby Mchenry
2026-05-26 17:42:14 -05:00
committed by GitHub
parent 186632fa88
commit 8c69001289
4 changed files with 228 additions and 2 deletions
+36 -2
View File
@@ -153,6 +153,15 @@ function resolveMethodOnType(
context: ResolutionContext,
confidence: number,
resolvedBy: ResolvedRef['resolvedBy'],
/**
* Optional FQN that identifies WHICH class declaration `typeName`
* refers to in the caller's file. When multiple candidates share
* the same qualifiedName (`FooConverter::convert` in both
* `dao/converter/` and `service/converter/`), the FQN's
* file-path-suffix picks the right one — the disambiguation
* signal Java imports carry but the call site doesn't (#314).
*/
preferredFqn?: string,
): ResolvedRef | null {
// Look up methods by name and match by qualifiedName ending in
// `<typeName>::<methodName>`. This works whether the method is defined
@@ -161,21 +170,40 @@ function resolveMethodOnType(
// The previous same-file approach missed the latter — the typical C++ layout.
const methodCandidates = context.getNodesByName(methodName);
const want = `${typeName}::${methodName}`;
const matches: Node[] = [];
for (const m of methodCandidates) {
if (m.kind !== 'method') continue;
if (m.language !== ref.language) continue;
const qn = m.qualifiedName;
if (qn === want || qn.endsWith(`::${want}`)) {
matches.push(m);
}
}
if (matches.length === 0) return null;
if (matches.length > 1 && preferredFqn) {
const ext = ref.language === 'kotlin' ? '.kt' : '.java';
const fqnPath = preferredFqn.replace(/\./g, '/') + ext;
const chosen = matches.find((m) => {
const fp = m.filePath.replace(/\\/g, '/');
return fp.endsWith(fqnPath) || fp.endsWith('/' + fqnPath);
});
if (chosen) {
return {
original: ref,
targetNodeId: m.id,
targetNodeId: chosen.id,
confidence,
resolvedBy,
};
}
}
return null;
return {
original: ref,
targetNodeId: matches[0]!.id,
confidence,
resolvedBy,
};
}
// C++ keywords/control-flow tokens that can appear right before a receiver
@@ -365,6 +393,11 @@ export function matchMethodCall(
if ((ref.language === 'java' || ref.language === 'kotlin') && dotMatch) {
const inferredType = inferJavaFieldReceiverType(objectOrClass!, ref, context);
if (inferredType) {
// When two classes share the same simple name, the caller file's
// import is the only signal that names WHICH one — pass the
// imported FQN so resolveMethodOnType can disambiguate (#314).
const imports = context.getImportMappings(ref.filePath, ref.language);
const importedFqn = imports.find((i) => i.localName === inferredType)?.source;
const typedMatch = resolveMethodOnType(
inferredType,
methodName!,
@@ -372,6 +405,7 @@ export function matchMethodCall(
context,
0.9,
'instance-method',
importedFqn,
);
if (typedMatch) {
return typedMatch;