feat(typescript): use unique vnames for anonymous functions (#5593)

kythe · Apr 21, 2023 · 7ef0880 · 7ef0880
1 parent eb169e6
commit 7ef0880
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/kythe/typescript/indexer.ts b/kythe/typescript/indexer.ts
@@ -1270,8 +1270,7 @@ class Visitor {
       const vname = this.host.getSymbolName(sym, TSNamespace.VALUE, context);
       return {sym, vname};
     } else {
-      // TODO: choose VName for anonymous functions and return symbol
-      return {vname: this.newVName('TODO', 'TODOPath')};
+      return {vname: this.host.scopedSignature(node)};
     }
   }
 
@@ -2666,6 +2665,7 @@ class Visitor {
       case ts.SyntaxKind.ArrowFunction:
       case ts.SyntaxKind.Constructor:
       case ts.SyntaxKind.FunctionDeclaration:
+      case ts.SyntaxKind.FunctionExpression:
       case ts.SyntaxKind.MethodDeclaration:
       case ts.SyntaxKind.MethodSignature:
       case ts.SyntaxKind.GetAccessor:

diff --git a/kythe/typescript/testdata/anonymous.ts b/kythe/typescript/testdata/anonymous.ts
@@ -0,0 +1,17 @@
+
+function takeAnything(a: any) {}
+
+takeAnything(
+    //- @"() => {}" defines vname("arrow0", _, _, _, _)
+    () => {}
+);
+
+takeAnything(
+    //- @"() => {}" defines vname("arrow1", _, _, _, _)
+    () => {}
+);
+
+takeAnything(
+    //- @"function() {}" defines vname("func2", _, _, _, _)
+    function() {}
+)
diff --git a/kythe/typescript/testdata/marked_source/function.ts b/kythe/typescript/testdata/marked_source/function.ts
@@ -53,4 +53,5 @@
 //- ArgCodeDefaultValue.pre_text "'0'"
 function myFunction(arg: string = '0'): number {
     return 0;
-}
+}
+