Merge pull request #167 from github/ts-fix-inheritance

Author: hendrikvanantwerpen

languages/tree-sitter-stack-graphs-typescript/.gitignore

@@ -1,3 +1,4 @@
+/*.html
 /Cargo.lock
 /node_modules
 /package-lock.json

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

@@ -1435,9 +1435,14 @@ if none @is_async {
 
   ; class type inherits from heritage type
   edge @class_decl.generic_inner_type -> @heritage.type_members
+  attr (@class_decl.generic_inner_type -> @heritage.type_members) precedence = 1
 
   ; class object inherits from super class object
   edge @class_decl.static_type -> @heritage.static_members
+  attr (@class_decl.static_type -> @heritage.static_members) precedence = 1
+
+  ; expose super definition
+  edge @class_decl.generic_inner_lexical_scope -> @heritage.lexical_defs
 }
 [
   (interface_declaration (extends_type_clause)@extends)
@@ -1468,7 +1473,7 @@ if none @is_async {
   attr (@class_decl.this__expr_def__ns) pop_symbol = "%E"
   edge @class_decl.this__expr_def__ns -> @class_decl.this__expr_def
   ;
-  attr (@class_decl.this__expr_def) pop_symbol = "this"
+  attr (@class_decl.this__expr_def) pop_symbol = "this", source_node = @class_decl, empty_source_span
   edge @class_decl.this__expr_def -> @class_decl.this__expr_def__typeof
   ;
   attr (@class_decl.this__expr_def__typeof) pop_symbol = ":"
@@ -1512,9 +1517,11 @@ if none @is_async {
 
   ; class type consists of body members
   edge @class_decl.generic_inner_type -> @body.type_members
+  attr (@class_decl.generic_inner_type -> @body.type_members) precedence = 2
 
   ; class object consists of static members
   edge @class_decl.static_type -> @body.static_members
+  attr (@class_decl.static_type -> @body.static_members) precedence = 2
 }
 [
   (interface_declaration      body:(_)@body)
@@ -2826,7 +2833,7 @@ if none @is_def {
   node @this.expr_ref__typeof
 
   ; expression reference
-  attr (@this.expr_ref) symbol_reference = "this", source_node = @this
+  attr (@this.expr_ref) node_reference = @this
   edge @this.expr_ref -> @this.expr_ref__ns
   ;
   attr (@this.expr_ref__ns) push_symbol = "%E"
@@ -2844,6 +2851,22 @@ if none @is_def {
 ;; super
 
 (super)@super {
+  node @super.expr_ref
+  node @super.expr_ref__ns
+  node @super.expr_ref__typeof
+
+  ; expression reference
+  attr (@super.expr_ref) node_reference = @super
+  edge @super.expr_ref -> @super.expr_ref__ns
+  ;
+  attr (@super.expr_ref__ns) push_symbol = "%E"
+  edge @super.expr_ref__ns -> @super.lexical_scope
+
+  ; type is type of the reference
+  edge @super.type -> @super.expr_ref__typeof
+  ;
+  attr (@super.expr_ref__typeof) push_symbol = ":"
+  edge @super.expr_ref__typeof -> @super.expr_ref
 }
 
 
@@ -3848,13 +3871,18 @@ if none @is_async {
 
   ; class type inherits from heritage type
   edge @class_expr.generic_inner_type -> @heritage.type_members
+  attr (@class_expr.generic_inner_type -> @heritage.type_members) precedence = 1
 
   ; type of class expression inherits heritage static members
   edge @class_expr.type -> @heritage.static_members
+  attr (@class_expr.type -> @heritage.static_members) precedence = 1
 
   ; mark type scope as endpoint
   attr (@class_expr.type) is_endpoint
   attr (@class_expr.generic_inner_type) is_endpoint
+
+  ; expose super definition
+  edge @class_expr.generic_inner_lexical_scope -> @heritage.lexical_defs
 }
 
 ; this
@@ -4654,6 +4682,7 @@ if none @is_acc {
   (implements_clause)
 ]@heritage {
   node @heritage.lexical_scope
+  node @heritage.lexical_defs
   node @heritage.type_members
   node @heritage.static_members
 }
@@ -4664,8 +4693,24 @@ if none @is_acc {
   ; propagate lexical scope
   edge @extends_or_implements.lexical_scope -> @class_heritage.lexical_scope
 
+  node super__expr_def
+  node super__expr_def__ns
+  node super__expr_def__typeof
+  ;
+  ; super expr definition
+  edge @class_heritage.lexical_defs -> super__expr_def__ns
+  ;
+  attr (super__expr_def__ns) pop_symbol = "%E"
+  edge super__expr_def__ns -> super__expr_def
+  ;
+  attr (super__expr_def) pop_symbol = "super", source_node = @class_heritage, empty_source_span
+  edge super__expr_def -> super__expr_def__typeof
+  ;
+  attr (super__expr_def__typeof) pop_symbol = ":"
+
   ; type members inherited from extends & implements clauses
   edge @class_heritage.type_members -> @extends_or_implements.type_members
+  edge super__expr_def__typeof -> @extends_or_implements.type_members
 
   ; static members inherited from extends & implements clauses
   edge @class_heritage.static_members -> @extends_or_implements.static_members

languages/tree-sitter-stack-graphs-typescript/test/expressions/call-class-super-interface-method.ts

@@ -15,7 +15,7 @@ let foo: C;
 
   foo.m(null).value;
 //^ defined: 13
-//    ^ defined: 4, 10
+//    ^ defined: 10
 //            ^ defined: 1
 
 export {};

languages/tree-sitter-stack-graphs-typescript/test/expressions/call-object-overloaded-method.ts

@@ -0,0 +1,14 @@
+class Super {
+  bar() { }
+}
+
+class Sub extends Super {
+  main() {
+    this.bar();
+    //   ^ defined: 13
+    super.bar();
+    //    ^ defined: 2
+  }
+
+  bar() { }
+}