Merge pull request #140 from RReverser/newline-before-string-token

js: Newline before string is as significant as before other literals
tdewolff · May 10, 2017 · 74b1505 · 74b1505
2 parents 7c0f30b + 335f882
commit 74b1505
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/js/js.go b/js/js.go
@@ -59,7 +59,7 @@ func (o *Minifier) Minify(_ *minify.M, w io.Writer, r io.Reader, _ map[string]st
 		} else {
 			first := data[0]
 			if (prev == js.IdentifierToken || prev == js.NumericToken || prev == js.PunctuatorToken || prev == js.StringToken || prev == js.RegexpToken) &&
-				(tt == js.IdentifierToken || tt == js.NumericToken || tt == js.PunctuatorToken || tt == js.RegexpToken) {
+				(tt == js.IdentifierToken || tt == js.NumericToken || tt == js.StringToken || tt == js.PunctuatorToken || tt == js.RegexpToken) {
 				if lineTerminatorQueued && (prev != js.PunctuatorToken || prevLast == '}' || prevLast == ']' || prevLast == ')' || prevLast == '+' || prevLast == '-' || prevLast == '"' || prevLast == '\'') &&
 					(tt != js.PunctuatorToken || first == '{' || first == '[' || first == '(' || first == '+' || first == '-' || first == '!' || first == '~') {
 					if _, err := w.Write(newlineBytes); err != nil {

diff --git a/js/js_test.go b/js/js_test.go
@@ -23,15 +23,15 @@ func TestJS(t *testing.T) {
 		{"a\n\nb", "a\nb"},
 		{"a// comment\nb", "a\nb"},
 		{"''\na", "''\na"},
-		{"''\n''", "''''"},
+		{"''\n''", "''\n''"},
 		{"]\n0", "]\n0"},
 		{"a\n{", "a\n{"},
 		{";\na", ";a"},
 		{",\na", ",a"},
 		{"}\na", "}\na"},
 		{"+\na", "+\na"},
 		{"+\n(", "+\n("},
-		{"+\n\"\"", "+\"\""},
+		{"+\n\"\"", "+\n\"\""},
 		{"a + ++b", "a+ ++b"},                                          // JSMin caution
 		{"var a=/\\s?auto?\\s?/i\nvar", "var a=/\\s?auto?\\s?/i\nvar"}, // #14
 		{"var a=0\n!function(){}", "var a=0\n!function(){}"},           // #107