Merge pull request #7 from mrclay/es6_lit

Preserve ES6 template literals
mrclay · Dec 6, 2018 · bb05feb · bb05feb
2 parents 95df8a5 + 84e3cff
commit bb05feb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/JSMin/JSMin.php b/src/JSMin/JSMin.php
@@ -196,7 +196,8 @@ protected function action($command)
                 // fallthrough intentional
             case self::ACTION_DELETE_A: // 2
                 $this->a = $this->b;
-                if ($this->a === "'" || $this->a === '"') { // string literal
+                if ($this->a === "'" || $this->a === '"' || $this->a === '`') { // string/template literal
+                    $delimiter = $this->a;
                     $str = $this->a; // in case needed for exception
                     for(;;) {
                         $this->output .= $this->a;
@@ -206,7 +207,9 @@ protected function action($command)
                         if ($this->a === $this->b) { // end quote
                             break;
                         }
-                        if ($this->isEOF($this->a)) {
+                        if ($delimiter === '`' && $this->a === "\n") {
+                            // leave the newline
+                        } elseif ($this->isEOF($this->a)) {
                             $byte = $this->inputIndex - 1;
                             throw new UnterminatedStringException(
                                 "JSMin: Unterminated String at byte {$byte}: {$str}");
@@ -216,7 +219,7 @@ protected function action($command)
                             $this->output .= $this->a;
                             $this->lastByteOut = $this->a;
 
-                            $this->a       = $this->get();
+                            $this->a = $this->get();
                             $str .= $this->a;
                         }
                     }

diff --git a/tests/Resources/minify/expected/es6-literal.js b/tests/Resources/minify/expected/es6-literal.js
@@ -0,0 +1,2 @@
+`line
+break`+`he  llo`;foo`hel( '');lo`;`he\nl\`lo`;(`he${one + two}`)
diff --git a/tests/Resources/minify/input/es6-literal.js b/tests/Resources/minify/input/es6-literal.js
@@ -0,0 +1,2 @@
+`line
+break` + `he  llo`; foo`hel( '');lo`; `he\nl\`lo`; (`he${one + two}`)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		`line
		break`+`he llo`;foo`hel( '');lo`;`he\nl\`lo`;(`he${one + two}`)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		`line
		break` + `he llo`; foo`hel( '');lo`; `he\nl\`lo`; (`he${one + two}`)