Fixed heredoc blank line bugs

Author: jodysimpson

src/lexer/strings.js

@@ -135,7 +135,7 @@ module.exports = {
     // consumeLeadingSpaces is false happen DOC prematch END HEREDOC stage.
 
     // Ensure current state is really after a new line break, not after a such as ${variables}
-    const prev_ch = this._input.substring(offset - 2, offset - 1);
+    const prev_ch = this._input[offset - 2];
     if (prev_ch !== "\n" && prev_ch !== "\r") {
       return false;
     }
@@ -145,26 +145,34 @@ module.exports = {
     let indentation_uses_tabs = false;
     // reset heredoc_label structure
     let indentation = 0;
-    let leading_ch = this._input.substring(offset - 1, offset);
+    let leading_ch = this._input[offset - 1];
     let valid_endings = ["\n", "\r", ";"];
 
     if (this.version >= 703) {
       valid_endings = valid_endings.concat(["\t", " ", ",", ")", "]"]);
-    }
 
-    while (leading_ch === "\t" || leading_ch === " ") {
-      if (leading_ch === " ") {
-        indentation_uses_spaces = true;
-      } else if (leading_ch === "\t") {
-        indentation_uses_tabs = true;
+      while (leading_ch === "\t" || leading_ch === " ") {
+        if (leading_ch === " ") {
+          indentation_uses_spaces = true;
+        } else if (leading_ch === "\t") {
+          indentation_uses_tabs = true;
+        }
+
+        leading_ch = this._input[offset + indentation];
+        indentation++;
       }
 
-      leading_ch = this._input[offset + indentation];
-      indentation++;
-    }
+      // Move offset to skip leading whitespace
+      offset = offset + indentation;
 
-    // Move offset to skip leading whitespace
-    offset = offset + indentation;
+      // return out if there was only whitespace on this line
+      if (
+        this._input[offset - 1] === "\n" ||
+        this._input[offset - 1] === "\r"
+      ) {
+        return false;
+      }
+    }
 
     if (
       this._input.substring(
@@ -216,9 +224,11 @@ module.exports = {
         return;
       }
 
-      // skip one line
-      while (this._input[offset++] !== "\n" && offset < this._input.length) {
-        // skip
+      if (this._input[offset - 1] !== "\n") {
+        // skip one line
+        while (this._input[offset++] !== "\n" && offset < this._input.length) {
+          // skip
+        }
       }
 
       offset++;

src/parser/scalar.js

@@ -128,7 +128,11 @@ module.exports = {
         inCoutingState = false;
       }
 
-      if (inCheckState && leadingWhitespaceCharCount < indentation) {
+      if (
+        text[offset] !== "\n" &&
+        inCheckState &&
+        leadingWhitespaceCharCount < indentation
+      ) {
         this.raiseError(
           `Invalid body indentation level (expecting an indentation at least ${indentation})`
         );
@@ -335,12 +339,14 @@ module.exports = {
       result = result(
         "string",
         false,
-        this.remove_heredoc_leading_whitespace_chars(
-          this.resolve_special_chars(text, isDoubleQuote),
-          this.lexer.heredoc_label.indentation,
-          this.lexer.heredoc_label.indentation_uses_spaces,
-          this.lexer.heredoc_label.first_encaps_node
-        ),
+        this.version >= 703
+          ? this.remove_heredoc_leading_whitespace_chars(
+              this.resolve_special_chars(text, isDoubleQuote),
+              this.lexer.heredoc_label.indentation,
+              this.lexer.heredoc_label.indentation_uses_spaces,
+              this.lexer.heredoc_label.first_encaps_node
+            )
+          : text,
         false,
         text
       );