JS: Provide source locations for JSDocTypeExpr

Author: asger-semmle

javascript/extractor/src/com/semmle/js/extractor/JSDocExtractor.java

@@ -70,6 +70,7 @@ private Label visit(JSDocTypeExpression nd) {
       Label key = trapwriter.localID(nd);
       int kind = jsdocTypeExprKinds.get(nd.getType());
       trapwriter.addTuple("jsdoc_type_exprs", key, kind, parent, idx, nd.pp());
+      locationManager.emitNodeLocation(nd, key);
       return key;
     }
 

javascript/extractor/src/com/semmle/js/extractor/Main.java

@@ -37,7 +37,7 @@ public class Main {
    * A version identifier that should be updated every time the extractor changes in such a way that
    * it may produce different tuples for the same file under the same {@link ExtractorConfig}.
    */
-  public static final String EXTRACTOR_VERSION = "2019-03-21";
+  public static final String EXTRACTOR_VERSION = "2019-04-17";
 
   public static final Pattern NEWLINE = Pattern.compile("\n");
 

javascript/extractor/src/com/semmle/js/parser/JSDocParser.java

@@ -1000,7 +1000,7 @@ private JSDocTypeExpression parseBasicTypeExpression() throws ParseError {
         case STAR:
           loc = loc();
           consume(Token.STAR);
-          return new AllLiteral(loc);
+          return finishNode(new AllLiteral(loc));
 
         case LPAREN:
           return parseUnionType();
@@ -1015,13 +1015,13 @@ private JSDocTypeExpression parseBasicTypeExpression() throws ParseError {
           if (value.equals("null")) {
             loc = loc();
             consume(Token.NAME);
-            return new NullLiteral(loc);
+            return finishNode(new NullLiteral(loc));
           }
 
           if (value.equals("undefined")) {
             loc = loc();
             consume(Token.NAME);
-            return new UndefinedLiteral(loc);
+            return finishNode(new UndefinedLiteral(loc));
           }
 
           context = save();

javascript/ql/src/semmle/javascript/JSDoc.qll

@@ -39,19 +39,16 @@ abstract class Documentable extends ASTNode {
  * A syntactic element that a JSDoc type expression may be nested in, that is,
  * either a JSDoc tag or another JSDoc type expression.
  */
-class JSDocTypeExprParent extends @jsdoc_type_expr_parent {
-  /** Gets a textual representation of this element. */
-  string toString() { none() }
+class JSDocTypeExprParent extends @jsdoc_type_expr_parent, Locatable {
+  override Location getLocation() { hasLocation(this, result) }
 
   JSDoc getJSDocComment() { none() }
 }
 
 /**
  * A JSDoc tag such as `@param Object options An object literal with options.`
  */
-class JSDocTag extends @jsdoc_tag, JSDocTypeExprParent, Locatable {
-  override Location getLocation() { hasLocation(this, result) }
-
+class JSDocTag extends @jsdoc_tag, JSDocTypeExprParent {
   /** Gets the tag title; for instance, the title of a `@param` tag is `"param"`. */
   string getTitle() { jsdoc_tags(this, result, _, _, _) }