Allow imported methods to route correctly

Author: rnkaufman

languages/tree-sitter-stack-graphs-java/src/stack-graphs.tsg

@@ -40,8 +40,6 @@ attribute node_symbol = node            => symbol = (source-text node), source_n
 (program)@prog {
   node @prog.defs
   node @prog.lexical_scope
-  node @prog.exports
-  node @prog.globals
   edge @prog.lexical_scope -> ROOT_NODE
   edge @prog.lexical_scope -> @prog.defs
 }
@@ -87,6 +85,7 @@ attribute node_symbol = node            => symbol = (source-text node), source_n
   edge @import.defs -> @name.value
 }
 
+; Import rules lifted mostly from typescript
 (program [(import_declaration)]* @import) @prog {
   var proj_scope = ROOT_NODE
 
@@ -103,9 +102,6 @@ attribute node_symbol = node            => symbol = (source-text node), source_n
     set proj_scope = proj_def
   }
 
-  ; expose globals
-  edge proj_scope -> @prog.globals
-
   var mod_scope = proj_scope
   if (not (is-empty @import)) {
     ; module definition
@@ -130,8 +126,6 @@ attribute node_symbol = node            => symbol = (source-text node), source_n
     }
     ; make the last one a definition
     attr (mod_scope) is_definition, source_node = @prog, empty_source_span
-    ; expose exports via module definition
-    edge mod_scope -> @prog.exports
   } else {
     ; expose definitions via project scope
     edge mod_scope -> @prog.defs
@@ -1299,6 +1293,16 @@ attribute node_symbol = node            => symbol = (source-text node), source_n
   edge @this.type -> @this.lexical_scope
 }
 
+(scoped_type_identifier
+  (type_identifier) @imported_class_name (type_identifier) @method_name) {
+
+  node member
+  attr (member) push_symbol = "."
+
+  edge @method_name.type -> member
+  edge member -> @imported_class_name.type
+}
+
 ;; ==========
 ;;  Comments
 ;; ==========

languages/tree-sitter-stack-graphs-java/test/imports_and_exports/import_method.java

@@ -1,12 +1,11 @@
 /*--- path: a.java ---*/
 import Foo;
 
-
 public class Importer {
   public static void main(String[] args) {
     x = new Foo.bar();
-              // ^ defined: 17
-          // ^ defined: 2, 16
+              // ^ defined: 16
+          // ^ defined: 2, 15
 
   }
 }