Disallow subscripting from crossing whiteblock boundaries

Addresses wcjohnson/lightscript#33
wcjohnson · Oct 6, 2017 · 87afe91 · 87afe91
1 parent d447c02
commit 87afe91
Show file tree

Hide file tree

Showing 5 changed files with 392 additions and 1 deletion.
diff --git a/src/parser/expression.js b/src/parser/expression.js
@@ -386,7 +386,9 @@ pp.parseSubscripts = function (base, startPos, startLoc, noCalls) {
   this.state.noPipeSubscripts = false;
 
   for (;;) {
-    if (this.hasPlugin("bangCall") && this.shouldUnwindBangSubscript()) {
+    if (this.hasPlugin("lightscript") && this.crossesWhiteBlockBoundary()) {
+      return base;
+    } else if (this.hasPlugin("bangCall") && this.shouldUnwindBangSubscript()) {
       return base;
     } else if (!noCalls && this.eat(tt.doubleColon)) {
       const node = this.startNodeAt(startPos, startLoc);

diff --git a/src/parser/statement.js b/src/parser/statement.js
@@ -661,10 +661,14 @@ pp.parseBlockBody = function (node, allowDirectives, topLevel, end) {
   let oldStrict;
   let octalPosition;
 
+  const oldInWhiteBlock = this.state.inWhiteBlock;
+  const oldWhiteBlockIndentLevel = this.state.whiteBlockIndentLevel;
   this.state.nestedBlockLevel++;
 
   let isEnd;
   if (this.hasPlugin("lightscript") && typeof end === "number") {
+    this.state.inWhiteBlock = true;
+    this.state.whiteBlockIndentLevel = end;
     isEnd = () => this.state.indentLevel <= end || this.match(tt.eof);
   } else {
     isEnd = () => this.eat(end);
@@ -698,6 +702,10 @@ pp.parseBlockBody = function (node, allowDirectives, topLevel, end) {
   }
 
   this.state.nestedBlockLevel--;
+  if (this.hasPlugin("lightscript")) {
+    this.state.inWhiteBlock = oldInWhiteBlock;
+    this.state.whiteBlockIndentLevel = oldWhiteBlockIndentLevel;
+  }
 
   if (oldStrict === false) {
     this.setStrict(false);

diff --git a/src/plugins/lightscript.js b/src/plugins/lightscript.js
@@ -177,6 +177,10 @@ pp.parseWhiteBlock = function (isExpression?) {
   return this.parseMultilineWhiteBlock(node, indentLevel);
 };
 
+pp.crossesWhiteBlockBoundary = function() {
+  return (this.state.inWhiteBlock && this.state.indentLevel <= this.state.whiteBlockIndentLevel);
+};
+
 pp.expectCommaOrLineBreak = function (loc = null) {
   // TODO: consider error message like "Missing comma or newline."
   if (!(this.eat(tt.comma) || this.isLineBreak())) this.unexpected(loc, tt.comma);

diff --git a/test/fixtures/bang-call/subscripts/basic-promise-pattern/actual.js b/test/fixtures/bang-call/subscripts/basic-promise-pattern/actual.js
@@ -0,0 +1,5 @@
+a()
+  .then! b ->
+    c
+  .catch! d ->
+    e