JS: Make jump-to-def behave nicer

Author: asgerf

javascript/ql/lib/definitions.qll

@@ -140,11 +140,39 @@ private predicate typedInvokeLookup(AstNode ref, AstNode decl, string kind) {
   exists(InvokeExpr invoke, Expr callee |
     callee = invoke.getCallee().getUnderlyingReference() and
     (ref = callee.(Identifier) or ref = callee.(DotExpr).getPropertyNameExpr()) and
-    decl = invoke.getResolvedCallee() and
+    decl = redirectCallee(invoke.getResolvedCallee()) and
     kind = "M"
   )
 }
 
+/** Redirects calls to `f` to a more appropriate AST node for jump-to-def. */
+private AstNode getCalleeRedirect(Function f) {
+  exists(ConstructorDeclaration ctor, ClassDefinition cls |
+    ctor.isSynthetic() and
+    f = ctor.getBody() and
+    cls = ctor.getDeclaringClass()
+  |
+    result = cls.getIdentifier()
+    or
+    not exists(cls.getIdentifier()) and
+    result = cls
+  )
+  or
+  exists(MethodDeclaration member |
+    not member instanceof ConstructorDeclaration and
+    f = member.getBody() and
+    result = member.getNameExpr()
+  )
+}
+
+bindingset[f]
+private AstNode redirectCallee(Function f) {
+  result = getCalleeRedirect(f)
+  or
+  not exists(getCalleeRedirect(f)) and
+  result = f
+}
+
 /**
  * Holds if `ref` is a JSDoc type annotation referring to a class defined at `decl`.
  */

javascript/ql/test/library-tests/DataFlow/tests.expected

@@ -1514,6 +1514,7 @@ sources
 | tst2.ts:7:1:9:1 | return of function setX |
 | tst2.ts:8:3:8:5 | A.x |
 | tst2.ts:11:11:11:13 | A.x |
+| tst2.ts:11:11:11:23 | A.x as number |
 | tst2.ts:13:1:13:40 | class S ... ing> {} |
 | tst2.ts:13:26:13:29 | List |
 | tst2.ts:13:39:13:38 | (...arg ... rgs); } |

javascript/ql/test/query-tests/definitions/definitions.expected

@@ -10,11 +10,11 @@
 | client.ts:13:35:13:35 | C | tslib.ts:1:8:3:1 | class C {\\n  m() {}\\n} | T |
 | client.ts:13:47:13:47 | C | tslib.ts:6:10:8:3 | class C ...  {}\\n  } | T |
 | client.ts:14:3:14:3 | x | client.ts:13:22:13:22 | x | V |
-| client.ts:14:5:14:5 | m | client.ts:4:3:4:8 | m() {} | M |
+| client.ts:14:5:14:5 | m | client.ts:4:3:4:3 | m | M |
 | client.ts:15:3:15:3 | y | client.ts:13:28:13:28 | y | V |
-| client.ts:15:5:15:5 | m | tslib.ts:2:3:2:8 | m() {} | M |
+| client.ts:15:5:15:5 | m | tslib.ts:2:3:2:3 | m | M |
 | client.ts:16:3:16:3 | z | client.ts:13:38:13:38 | z | V |
-| client.ts:16:5:16:5 | m | tslib.ts:7:5:7:10 | m() {} | M |
+| client.ts:16:5:16:5 | m | tslib.ts:7:5:7:5 | m | M |
 | d.js:1:17:1:21 | './c' | c.js:1:1:1:20 | <toplevel> | I |
 | d.js:10:1:10:1 | A | d.js:7:1:9:1 | functio ... = 42;\\n} | V |
 | d.js:16:19:16:23 | Super | d.js:12:1:14:1 | class S ... () {}\\n} | V |