fix(typescript): don't emit absvar nodes (#5273)

kythe · May 4, 2022 · 1e4467b · 1e4467b
1 parent a8cbbde
commit 1e4467b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 93 deletions.
diff --git a/kythe/typescript/indexer.ts b/kythe/typescript/indexer.ts
@@ -875,21 +875,6 @@ class Visitor {
             `type param ${param.getText()} has no symbol`);
         return;
       }
-      const kType = this.host.getSymbolName(sym, TSNamespace.TYPE);
-      var superType: VName|undefined;
-      if (kType) {
-        this.emitNode(kType, NodeKind.ABSVAR);
-        this.emitEdge(
-            this.newAnchor(param.name), EdgeKind.DEFINES_BINDING, kType);
-        // ...<T extends A>
-        if (param.constraint) {
-          superType = this.visitType(param.constraint);
-          if (superType)
-            this.emitEdge(kType, EdgeKind.BOUNDED_UPPER, superType);
-        }
-        // ...<T = A>
-        if (param.default) this.visitType(param.default);
-      }
       const kTVar = this.host.getSymbolName(sym, TSNamespace.TYPE_MIGRATION);
       if (kTVar && parent) {
         this.emitNode(kTVar, NodeKind.TVAR);
@@ -900,9 +885,12 @@ class Visitor {
         this.emitEdge(parent, makeOrdinalEdge(EdgeKind.TPARAM, ordinal), kTVar);
         // ...<T extends A>
         if (param.constraint) {
+          var superType = this.visitType(param.constraint);
           if (superType)
             this.emitEdge(kTVar, EdgeKind.BOUNDED_UPPER, superType);
         }
+        // ...<T = A>
+        if (param.default) this.visitType(param.default);
       }
     }
   }

diff --git a/kythe/typescript/testdata/generic.ts b/kythe/typescript/testdata/generic.ts
diff --git a/kythe/typescript/testdata/schema.ts b/kythe/typescript/testdata/schema.ts
@@ -101,7 +101,7 @@ let v = {
 //- @AliasArray defines/binding VName("AliasArray#type", _, _, "testdata/schema", "typescript")
 type AliasArray<
     // TypeParameter
-    //- @#0"T" defines/binding VName("AliasArray.T#type", _, _, "testdata/schema", "typescript")
+    //- @#0"T" defines/binding VName("AliasArray.T#mtype", _, _, "testdata/schema", "typescript")
     T> = Array<T>;
 
 //- @arrowFun defines/binding VName("arrowFun", _, _, "testdata/schema", "typescript")