Merge pull request #1257 from asger-semmle/jsdoc

JS: Add common interface between TypeExpr and JSDocTypeExpr

Author: Max Schaefer

change-notes/1.21/analysis-javascript.md

@@ -42,3 +42,6 @@
 ## Changes to QL libraries
 
 * `RegExpLiteral` is now a `DataFlow::SourceNode`.
+* `JSDocTypeExpr` now has source locations and is a subclass of `Locatable` and `TypeAnnotation`.
+* Various predicates named `getTypeAnnotation()` now return `TypeAnnotation` instead of `TypeExpr`.
+  In rare cases, this may cause compilation errors. Cast the result to `TypeExpr` if this happens.

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();