parser: strip trailing space on the line after -%} even if the space doesn't end with \n

Author: valyala

parser/scanner.go

@@ -72,7 +72,7 @@ type scanner struct {
 	rewind             bool
 }
 
-var tailOfLine = regexp.MustCompile(`^[[:blank:]]*\r?\n`)
+var tailOfLine = regexp.MustCompile(`^[[:blank:]]*(?:\r*\n)?`)
 var prevBlank = regexp.MustCompile(`[[:blank:]]+$`)
 
 func newScanner(r io.Reader, filePath string) *scanner {

parser/scanner_test.go

@@ -22,7 +22,7 @@ func TestScannerEndTagWithMinus(t *testing.T) {
 		[]tt{
 			{ID: tagName, Value: "foo"},
 			{ID: tagContents, Value: "baz aaa"},
-			{ID: text, Value: " awer"},
+			{ID: text, Value: "awer"},
 			{ID: tagName, Value: "aa="},
 			{ID: tagContents, Value: ""},
 		})
@@ -34,13 +34,14 @@ func TestScannerEndTagWithMinus(t *testing.T) {
 			{ID: tagName, Value: "aa="},
 			{ID: tagContents, Value: "-%"},
 		})
-	testScannerSuccess(t, "{%foo -%} \t\r\n\tawer{%aa= - %}",
+	testScannerSuccess(t, "{%foo -%} \t\r\r\n\n\tawer{%aa= - %}  \nbb",
 		[]tt{
 			{ID: tagName, Value: "foo"},
 			{ID: tagContents, Value: ""},
-			{ID: text, Value: "\tawer"},
+			{ID: text, Value: "\n\tawer"},
 			{ID: tagName, Value: "aa="},
 			{ID: tagContents, Value: "-"},
+			{ID: text, Value: "  \nbb"},
 		})
 	testScannerSuccess(t, "{%foo-%}\n  awer{%bar -%}\n",
 		[]tt{
@@ -63,11 +64,13 @@ func TestScannerEndTagWithMinus(t *testing.T) {
 }
 
 func TestScannerBeginTagWithMinus(t *testing.T) {
-	testScannerSuccess(t, "x\n   {%-foo%}",
+	testScannerSuccess(t, "x\n   {%-foo%}  {%- bar%}",
 		[]tt{
 			{ID: text, Value: "x\n"},
 			{ID: tagName, Value: "foo"},
 			{ID: tagContents, Value: ""},
+			{ID: tagName, Value: "bar"},
+			{ID: tagContents, Value: ""},
 		})
 	testScannerSuccess(t, "{%- foo%}",
 		[]tt{
@@ -88,21 +91,22 @@ func TestScannerBeginTagWithMinus(t *testing.T) {
 			{ID: tagContents, Value: "baz aaa"},
 			{ID: text, Value: " awer {- % aa= %}"},
 		})
-	testScannerSuccess(t, "{%-foo baz aaa%} awer {-{%- aa= xxx%}",
+	testScannerSuccess(t, "\n\n   {%- foo baz aaa -%} awer {-{%- aa= xxx%}",
 		[]tt{
+			{ID: text, Value: "\n\n"},
 			{ID: tagName, Value: "foo"},
 			{ID: tagContents, Value: "baz aaa"},
-			{ID: text, Value: " awer {-"},
+			{ID: text, Value: "awer {-"},
 			{ID: tagName, Value: "aa="},
 			{ID: tagContents, Value: "xxx"},
 		})
-	testScannerSuccess(t, "{%-foo%}{%bar%} \n {%baz%}",
+	testScannerSuccess(t, "{%-foo%}{%bar%} \n {%-baz%}",
 		[]tt{
 			{ID: tagName, Value: "foo"},
 			{ID: tagContents, Value: ""},
 			{ID: tagName, Value: "bar"},
 			{ID: tagContents, Value: ""},
-			{ID: text, Value: " \n "},
+			{ID: text, Value: " \n"},
 			{ID: tagName, Value: "baz"},
 			{ID: tagContents, Value: ""},
 		})

testdata/templates/integration.qtpl

@@ -106,7 +106,7 @@ It should contains all the quicktemplate stuff.
 
 	Strip leading and trailing space:
 	{%- for i := 0; i < 4; i++ -%}
-	x += {%d i %}
+	x += {%d i -%} + {%-d i+1 %}
 	{%- endfor -%}
 	end
 

testdata/templates/integration.qtpl.go

@@ -162,7 +162,7 @@ It should contains all the quicktemplate stuff.
 
 	Strip leading and trailing space:
 	{%- for i := 0; i < 4; i++ -%}
-	x += {%d i %}
+	x += {%d i -%} + {%-d i+1 %}
 	{%- endfor -%}
 	end
 
@@ -195,10 +195,10 @@ type integrationPage struct {
 
 
 	Strip leading and trailing space:
-	x += 0
-	x += 1
-	x += 2
-	x += 3
+	x += 0+1
+	x += 1+2
+	x += 2+3
+	x += 3+4
 	end
 
 	tail of the func