Disallow whitespace around safe tilde call operator

Addresses wcjohnson/lightscript#19
wcjohnson · Oct 7, 2017 · 15b9b13 · 15b9b13
1 parent adbe2a4
commit 15b9b13
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 1 deletion.
diff --git a/src/plugins/tildeCall.js b/src/plugins/tildeCall.js
@@ -16,7 +16,11 @@ export default function(parser) {
     node.callee = this.parseSubscripts(callee, this.state.start, this.state.startLoc, true);
 
     // Allow safe tilde calls (a~b?(c))
-    if (this.hasPlugin("safeCallExpression") && this.eat(tt.question)) {
+    if (
+      this.hasPlugin("safeCallExpression") &&
+      this.state.lastTokEnd === (this.state.pos - 1) &&
+      this.eat(tt.question)
+    ) {
       node.optional = true;
     }
 
@@ -31,6 +35,9 @@ export default function(parser) {
         return false;
       }
     } else {
+      if (node.optional && this.state.lastTokEnd !== (this.state.pos - 1)) {
+        this.unexpected(null, "Whitespace is forbidden after `?` in an optional call.");
+      }
       this.expect(tt.parenL);
       node.arguments = this.parseCallExpressionArguments(tt.parenR, false);
       node.arguments.unshift(firstArg);

diff --git a/test/fixtures/tilde-call-expression/safe/whitespace-illegal-1/actual.js b/test/fixtures/tilde-call-expression/safe/whitespace-illegal-1/actual.js
@@ -0,0 +1 @@
+a~b ?(c)
diff --git a/test/fixtures/tilde-call-expression/safe/whitespace-illegal-1/options.json b/test/fixtures/tilde-call-expression/safe/whitespace-illegal-1/options.json
@@ -0,0 +1,7 @@
+{
+  "alternatives": {
+    "default": {
+      "throws": "Unexpected token, expected ( (1:4)"
+    }
+  }
+}
diff --git a/test/fixtures/tilde-call-expression/safe/whitespace-illegal-2/actual.js b/test/fixtures/tilde-call-expression/safe/whitespace-illegal-2/actual.js
@@ -0,0 +1 @@
+a~b? (c)
diff --git a/test/fixtures/tilde-call-expression/safe/whitespace-illegal-2/options.json b/test/fixtures/tilde-call-expression/safe/whitespace-illegal-2/options.json
@@ -0,0 +1,7 @@
+{
+  "alternatives": {
+    "default": {
+      "throws": "Whitespace is forbidden after `?` in an optional call. (1:5)"
+    }
+  }
+}