Merge pull request #210 from github/update-java-interfaces

Update Java tssg for enum switches, interfaces, class extension

Author: rnkaufman

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

@@ -127,7 +127,7 @@ attribute node_symbol = node            => symbol = (source-text node), source_n
 
 (class_declaration
   superclass: (superclass
-    (type_identifier) @superclass_name)
+    (_) @superclass_name)
     body: (class_body) @class_body) @class {
 
     node ref
@@ -152,7 +152,6 @@ attribute node_symbol = node            => symbol = (source-text node), source_n
     edge @class.type -> ref
 }
 
-
 (class_declaration (type_parameters)) @class {
   node @class.type_parameters
   edge @class.lexical_scope -> @class.type_parameters
@@ -359,6 +358,16 @@ attribute node_symbol = node            => symbol = (source-text node), source_n
   edge @type.lexical_scope -> @this.lexical_scope
 }
 
+(interface_declaration
+  type_parameters: (type_parameters
+    (type_parameter
+      (type_identifier) @type_identifier))
+  body: (_) @body) @this {
+  node type_ident
+  attr (type_ident) node_definition = @type_identifier
+  edge @body.lexical_scope -> type_ident
+}
+
 (interface_body) @this {
   node @this.defs
   node @this.lexical_scope
@@ -605,6 +614,41 @@ attribute node_symbol = node            => symbol = (source-text node), source_n
   edge @stmt.after_scope -> @stmt.before_scope
 }
 
+(method_declaration
+ parameters:
+ (formal_parameters
+  (formal_parameter
+   type: (generic_type
+     (type_arguments
+      (type_identifier) @type))))
+ body:
+ (block
+  (switch_expression
+   condition: (_)
+   body: (switch_block
+     (switch_block_statement_group
+      (switch_label
+       (identifier))
+      @label))
+  )) @stmt) {
+
+  node ident
+  attr (ident) node_reference = @type
+
+  node ref__typeof
+  attr(ref__typeof) push_symbol = "."
+  node implicit_this__typeof
+  attr(implicit_this__typeof) push_symbol = ":"
+
+  edge implicit_this__typeof -> @label.lexical_scope
+  edge @label.lexical_scope -> ref__typeof
+  edge ref__typeof -> implicit_this__typeof
+  edge implicit_this__typeof -> ident
+
+  edge ident -> @stmt.after_scope
+}
+
+
 (switch_block) @this {
   node @this.lexical_scope
 }

languages/tree-sitter-stack-graphs-java/test/decl/class_extension.java

@@ -1,6 +1,15 @@
-class TestClass extends SecondTestClass {
-                        // ^ defined: 5
+class String {
+    public int length() {}
+};
+
+class HashMap<K, V> {
+    public Set<MapEntry<K, V>> entrySet() {}
+    //                  ^ defined: 5
 }
 
-class SecondTestClass {
+class LRUCache<K, V>
+    extends HashMap<K, V> {
+    //      ^ defined: 5
+    //              ^ defined: 10
+    //                 ^ defined: 10
 }

languages/tree-sitter-stack-graphs-java/test/decl/enum_switches.java

@@ -0,0 +1,23 @@
+enum Level {
+  LOW,
+  MEDIUM,
+  HIGH
+}
+
+class Supplier<T> {
+  T get() {}
+}
+
+class App {
+  boolean isSufficient(Supplier<Level> level_supplier) {
+    switch (level_supplier.get()) {
+      case LOW: return false;
+      //   ^ defined: 2
+      case MEDIUM: return false;
+      //   ^ defined: 3
+      case Level.HIGH: return true;
+      //   ^ defined: 1
+      //         ^ defined: 4
+    }
+  }
+}

languages/tree-sitter-stack-graphs-java/test/decl/interface.java

@@ -5,3 +5,12 @@ class A implements I {}
 //                 ^ defined: 1
 interface J extends I {}
 //                  ^ defined: 1
+
+interface Iterator<E> {
+    public E next() {}
+    //     ^ defined: 9
+}
+
+interface Set<E> {
+    public Iterator<E> iterator() {}
+}