#120 - fix inline raw attribute

glayzzle · Mar 5, 2018 · da39c64 · da39c64
1 parent b26659b
commit da39c64
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 21 deletions.
diff --git a/dist/php-parser.js b/dist/php-parser.js
@@ -7250,12 +7250,18 @@ module.exports = {
 
       case this.tok.T_INLINE_HTML:
         {
-          var start = this.lexer.yylloc.prev_line != this.lexer.yylloc.first_line ? this.lexer.yylloc.prev_offset : this.lexer.yylloc.first_offset;
-          result = this.node("inline");
           var value = this.text();
+          var prevChar = this.lexer.yylloc.first_offset > 0 ? this.lexer._input[this.lexer.yylloc.first_offset - 1] : null;
+          var fixFirstLine = prevChar === "\r" || prevChar === "\n";
+          // revert back the first stripped line
+          if (fixFirstLine) {
+            if (prevChar === "\n" && this.lexer.yylloc.first_offset > 1 && this.lexer._input[this.lexer.yylloc.first_offset - 2] === "\r") {
+              prevChar = "\r\n";
+            }
+          }
+          result = this.node("inline");
           this.next();
-          var raw = this.lexer._input.substring(start, this.lexer.yylloc.prev_offset);
-          return result(value, raw);
+          return result(value, fixFirstLine ? prevChar + value : value);
         }
 
       case this.tok.T_UNSET:

diff --git a/dist/php-parser.min.js b/dist/php-parser.min.js
diff --git a/dist/php-parser.min.js.map b/dist/php-parser.min.js.map
diff --git a/src/parser/statement.js b/src/parser/statement.js
@@ -274,18 +274,25 @@ module.exports = {
       }
 
       case this.tok.T_INLINE_HTML: {
-        const start =
-          this.lexer.yylloc.prev_line != this.lexer.yylloc.first_line
-            ? this.lexer.yylloc.prev_offset
-            : this.lexer.yylloc.first_offset;
-        result = this.node("inline");
         const value = this.text();
+        let prevChar =
+          this.lexer.yylloc.first_offset > 0
+            ? this.lexer._input[this.lexer.yylloc.first_offset - 1]
+            : null;
+        const fixFirstLine = prevChar === "\r" || prevChar === "\n";
+        // revert back the first stripped line
+        if (fixFirstLine) {
+          if (
+            prevChar === "\n" &&
+            this.lexer.yylloc.first_offset > 1 &&
+            this.lexer._input[this.lexer.yylloc.first_offset - 2] === "\r"
+          ) {
+            prevChar = "\r\n";
+          }
+        }
+        result = this.node("inline");
         this.next();
-        const raw = this.lexer._input.substring(
-          start,
-          this.lexer.yylloc.prev_offset
-        );
-        return result(value, raw);
+        return result(value, fixFirstLine ? prevChar + value : value);
       }
 
       case this.tok.T_UNSET:

diff --git a/test/astTests.js b/test/astTests.js
@@ -31,11 +31,18 @@ describe("Test AST structure", function() {
   });
 
   it("test inline", function() {
-    var ast = parser.parseCode('Hello <?php echo "World"; ?> !');
+    const ast = parser.parseCode("Hello <?php echo 'World'; ?>\n !");
     ast.children[0].kind.should.be.exactly("inline");
     ast.children[2].kind.should.be.exactly("inline");
     ast.children[0].value.should.be.exactly("Hello ");
     ast.children[2].value.should.be.exactly(" !");
+    ast.children[2].raw.should.be.exactly("\n !");
+  });
+
+  it("fix #120", function() {
+    const ast = parser.parseCode("<?php echo 'World'; ?>\r\n !");
+    ast.children[1].value.should.be.exactly(" !");
+    ast.children[1].raw.should.be.exactly("\r\n !");
   });
 
   it("test magics", function() {