feat(resolution): inherited this.X, Java/Kotlin cross-file method refs, Swift type scoping (#810)

Three callback-registration shapes deferred from #756/#808, one arc:

1. INHERITED this.X (TS/JS + every this.-routed language): a `this.<member>`
   registration whose member isn't on the enclosing class defers to a second
   pass (resolveDeferredThisMemberRefs — in-memory like deferredChainRefs,
   runs after implements/extends edges persist, same lifecycle as the #750
   conformance pass) and resolves up the supertype chain, depth-capped BFS,
   validated targets only. `bus.on("submit", this.handleSubmit)` in a
   subclass links to FormBase::handleSubmit; same-named methods on unrelated
   classes never match. this.-prefixed candidates skip the extraction name
   gate (an inherited member can't be in definedHere).

2. JAVA/KOTLIN qualified method refs: `Handlers::onMessage` /
   `OtherClass::handle` emit QUALIFIED names resolved by the scoped
   suffix-matcher — cross-file capable, gated on the scope name being a
   same-file type or an imported name (dotted JVM imports now contribute
   their last segment). `this::m` and `super::m` route through the
   class-scoped resolver (super rides the supertype pass). References
   through a VARIABLE (`subscriber::onNext`) deliberately produce nothing —
   receiver type is unknowable; RxJava's baseline bare capture was resolving
   these to same-named same-file methods (a test method "registering" an
   anonymous class's onNext) — the rework drops 18 such wrong edges and
   keeps the 7 genuine Type::method refs RxJava's main tree actually has.

3. SWIFT enclosing-type scoping (implicit self): bare callback names match
   methods only of the from-symbol's own type (extension/nested scopes
   reconciled by suffix), and top-level code never matches methods.
   Alamofire: −44 wrong edges (parameters like `request`/`data`/`retrier`
   resolving to same-named methods on unrelated protocols), all verified;
   the same-class param collision (`task`) remains and is documented.

New ResolutionContext.getNodeById lets matchers derive the from-symbol's
class scope. Controls: redis/fmt fnref edges byte-identical; excalidraw
stable; typeorm +4 genuine inherited-getter dependencies; zero calls edges
changed on any of 7 A/B repos; nodes identical everywhere. Kotlin
companion-object members extract unqualified (pre-existing) so
`Type::companionFn` stays silent rather than guessing — documented.

Full suite 1389 passed. EXTRACTION_VERSION 20 → 21 (re-index to benefit).

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Colby Mchenry
2026-06-11 15:09:01 -05:00
committed by GitHub
co-authored by Claude Opus 4.8
parent 38eb4e688c
commit 38095aa95b
10 changed files with 369 additions and 45 deletions
+116
View File
@@ -457,6 +457,122 @@ describe('Function-as-value capture (#756)', () => {
}
});
it('INHERITED this.X: resolves on a supertype via the second pass, never on unrelated classes', async () => {
tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'cg-fnref-inherit-'));
fs.writeFileSync(
path.join(tmpDir, 'base.ts'),
'export class FormBase { handleSubmit(): void {} }\n'
);
fs.writeFileSync(
path.join(tmpDir, 'unrelated.ts'),
'export class Unrelated { handleSubmit(): void {} }\n'
);
fs.writeFileSync(
path.join(tmpDir, 'login.ts'),
[
"import { FormBase } from './base';",
'declare const bus: { on(ev: string, cb: () => void): void };',
'export class LoginForm extends FormBase {',
' wire(): void { bus.on("submit", this.handleSubmit); }',
'}',
].join('\n')
);
const cg = CodeGraph.initSync(tmpDir);
try {
await cg.indexAll();
const handleSubmits = cg.getNodesByName('handleSubmit');
const baseM = handleSubmits.find((n) => n.qualifiedName.includes('FormBase'))!;
const unrelatedM = handleSubmits.find((n) => n.qualifiedName.includes('Unrelated'))!;
const intoBase = cg.getIncomingEdges(baseM.id).filter((e) => e.metadata?.fnRef === true);
expect(intoBase).toHaveLength(1);
expect(cg.getNode(intoBase[0]!.source)?.name).toBe('wire');
expect(
cg.getIncomingEdges(unrelatedM.id).filter((e) => e.metadata?.fnRef === true)
).toHaveLength(0);
} finally {
cg.destroy();
tmpDir = undefined;
}
});
it('JAVA: Type::method cross-file, this::/super:: scoped, variable:: yields nothing', async () => {
tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'cg-fnref-java-'));
fs.writeFileSync(
path.join(tmpDir, 'Handlers.java'),
[
'package com.example;',
'public class Handlers {',
' public static void onMessage(int x) { System.out.println(x); }',
'}',
].join('\n')
);
fs.writeFileSync(
path.join(tmpDir, 'BaseForm.java'),
['package com.example;', 'public class BaseForm {', ' void baseHandler(int x) {}', '}'].join('\n')
);
fs.writeFileSync(
path.join(tmpDir, 'Main.java'),
[
'package com.example;',
'import com.example.Handlers;',
'import java.util.function.IntConsumer;',
'public class Main extends BaseForm {',
' static void registerHandler(IntConsumer cb) { cb.accept(1); }',
' void run0() {}',
' void crossFile() { registerHandler(Handlers::onMessage); }',
' void thisRef() { registerHandler(this::run0); }',
' void superRef() { registerHandler(super::baseHandler); }',
' void varRef(Main m) { registerHandler(m::run0); }',
'}',
].join('\n')
);
const cg = CodeGraph.initSync(tmpDir);
try {
await cg.indexAll();
expect(sourceNames(cg, fnRefEdgesInto(cg, 'onMessage'))).toEqual(['crossFile']);
expect(sourceNames(cg, fnRefEdgesInto(cg, 'baseHandler'))).toEqual(['superRef']);
// this::run0 resolves class-scoped; m::run0 (variable receiver) must NOT
// add a second edge — exactly one source.
expect(sourceNames(cg, fnRefEdgesInto(cg, 'run0'))).toEqual(['thisRef']);
} finally {
cg.destroy();
tmpDir = undefined;
}
});
it('SWIFT SCOPING: bare ids hit only the enclosing types methods; top-level bare hits functions only', async () => {
tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'cg-fnref-swiftscope-'));
fs.writeFileSync(
path.join(tmpDir, 'main.swift'),
[
'func register(_ cb: (Int) -> Void) { cb(1) }',
'class Monitor {',
' func report(_ x: Int) {}',
' func wire() { register(report) }', // implicit self → Monitor::report
'}',
'class Other {',
// `report` here is a PARAMETER; Monitor::report must not win.
' func use(report: (Int) -> Void) { register(report) }',
'}',
'func topLevel() { register(report) }', // no implicit self → no method target
].join('\n')
);
const cg = CodeGraph.initSync(tmpDir);
try {
await cg.indexAll();
const edges = fnRefEdgesInto(cg, 'report');
expect(sourceNames(cg, edges)).toEqual(['wire']);
} finally {
cg.destroy();
tmpDir = undefined;
}
});
it('C UNGATED TABLES: a command table names handlers defined in OTHER files (redis pattern)', async () => {
tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'cg-fnref-ctable-'));
// Handler defined in its own file…