fix(extract): preserve Java receiver scope boundaries

Author: oleksii-tumanov

graphify/extractors/engine.py

@@ -432,9 +432,9 @@ def _java_method_receiver_types(
 ) -> dict[str, str]:
     """Build the receiver type table visible to one Java method.
 
-    Current-class fields are the base scope. Parameters and explicit local
-    declarations shadow them. Conflicting local declarations in disjoint nested
-    scopes are omitted because raw call facts do not retain lexical scope.
+    Current-class fields are the base scope, and parameters shadow them for the
+    full method. Conflicting local declarations are omitted because raw call
+    facts do not retain lexical scope.
     """
     method_types: dict[str, str] = {}
     ambiguous: set[str] = set()
@@ -467,6 +467,7 @@ def bind(name: str, type_name: str | None) -> None:
         node = stack.pop()
         if node.type in (
             "class_declaration",
+            "class_body",
             "interface_declaration",
             "record_declaration",
             "enum_declaration",
@@ -479,13 +480,18 @@ def bind(name: str, type_name: str | None) -> None:
                 node.child_by_field_name("type"), source
             )
             for name in _java_declarator_names(node, source):
-                bind(name, type_name)
+                if field_types.get(name) not in (None, type_name):
+                    method_types.pop(name, None)
+                    ambiguous.add(name)
+                else:
+                    bind(name, type_name)
         stack.extend(node.children)
 
     table = dict(field_types)
     table.update(method_types)
     for name in ambiguous:
         table.pop(name, None)
+    table.update({f"this.{name}": type_name for name, type_name in field_types.items()})
     return table
 
 
@@ -3854,7 +3860,8 @@ def walk_calls(
                             owner = receiver.child_by_field_name("object")
                             field = receiver.child_by_field_name("field")
                             if owner is not None and owner.type == "this" and field is not None:
-                                member_receiver = _read_text(field, source)
+                                member_receiver = f"this.{_read_text(field, source)}"
+                                is_this_field_call = True
             elif config.ts_module == "tree_sitter_ruby":
                 # Ruby's `call` node carries `receiver` and `method` as direct
                 # fields (no intermediate accessor node), so the generic accessor

tests/test_java_member_calls.py

@@ -93,6 +93,27 @@ def test_this_field_receiver_resolves_to_declared_type(tmp_path: Path):
     assert (run, gateway_charge) in calls
 
 
+def test_this_field_uses_field_type_when_parameter_shadows_name(tmp_path: Path):
+    calls, result = _calls(tmp_path, {
+        **_AMBIGUOUS_METHODS,
+        "Checkout.java": (
+            "class Checkout {\n"
+            "    PaymentGateway service;\n"
+            "    void run(AuditLog service) {\n"
+            "        service.charge();\n"
+            "        this.service.charge();\n"
+            "    }\n"
+            "}\n"
+        ),
+    })
+
+    run = _find(result, ".run()", "checkout")
+    gateway_charge = _find(result, ".charge()", "paymentgateway")
+    audit_charge = _find(result, ".charge()", "auditlog")
+    assert (run, gateway_charge) in calls
+    assert (run, audit_charge) in calls
+
+
 def test_parameter_and_local_receivers_resolve_per_method(tmp_path: Path):
     calls, result = _calls(tmp_path, {
         **_AMBIGUOUS_METHODS,
@@ -114,6 +135,34 @@ def test_parameter_and_local_receivers_resolve_per_method(tmp_path: Path):
     assert (from_local, gateway_charge) not in calls
 
 
+def test_nested_receiver_bindings_do_not_escape_their_scope(tmp_path: Path):
+    calls, result = _calls(tmp_path, {
+        **_AMBIGUOUS_METHODS,
+        "Checkout.java": (
+            "class Checkout {\n"
+            "    PaymentGateway service;\n"
+            "    void blockLocal() {\n"
+            "        service.charge();\n"
+            "        { AuditLog service = null; service.charge(); }\n"
+            "    }\n"
+            "    void anonymousClass() {\n"
+            "        new Object() { void nested() { AuditLog service = null; } };\n"
+            "        service.charge();\n"
+            "    }\n"
+            "}\n"
+        ),
+    })
+
+    block_local = _find(result, ".blockLocal()", "checkout")
+    anonymous_class = _find(result, ".anonymousClass()", "checkout")
+    gateway_charge = _find(result, ".charge()", "paymentgateway")
+    audit_charge = _find(result, ".charge()", "auditlog")
+    assert not any(source == block_local and "charge" in target
+                   for source, target in calls)
+    assert (anonymous_class, gateway_charge) in calls
+    assert (anonymous_class, audit_charge) not in calls
+
+
 def test_overloaded_callers_keep_body_scoped_receiver_types(tmp_path: Path):
     calls, result = _calls(tmp_path, {
         **_AMBIGUOUS_METHODS,