JS: Support postfix "!" operator in templates

asgerf · asgerf · commit 77fcf3d8a2a5 · 2021-01-18T12:16:13.000Z
diff --git a/javascript/extractor/src/com/semmle/jcorn/AngularExpressionParser.java b/javascript/extractor/src/com/semmle/jcorn/AngularExpressionParser.java
@@ -9,6 +9,7 @@
 import com.semmle.js.ast.Identifier;
 import com.semmle.js.ast.Position;
 import com.semmle.js.ast.SourceLocation;
+import com.semmle.ts.ast.NonNullAssertion;
 
 /**
  * Parser for Angular template expressions, based on the JS parser with
@@ -47,4 +48,16 @@ protected Expression buildBinary(
     }
     return super.buildBinary(startPos, startLoc, left, right, op, logical);
   }
+
+  @Override
+  protected Expression parseExprAtom(DestructuringErrors refDestructuringErrors) {
+    // Parse postfix "!" operator
+    Position startLoc = this.startLoc;
+    Expression expr = super.parseExprAtom(refDestructuringErrors);
+    if (this.type == TokenType.prefix && "!".equals(this.value)) {
+      this.next(); // consume "!" token
+      return finishNode(new NonNullAssertion(new SourceLocation(startLoc), expr));
+    }
+    return expr;
+  }
 }
