Add support for newline characters in raw string shortcode

diff --git a/parser/pageparser/pagelexer_shortcode.go b/parser/pageparser/pagelexer_shortcode.go
index 8238425bf1730dfe6f2dc1c16ae6a8d9f65488e3..61ba43f2c6a91ef675fedf7f6f2d36001f2e45ee 100644 (file)
--- a/parser/pageparser/pagelexer_shortcode.go
+++ b/parser/pageparser/pagelexer_shortcode.go
@@ -165,7 +165,7 @@ Loop:
                                openBacktickFound = true
                                l.ignore()
                        }
-               case r == eof, r == '\n':
+               case r == eof:
                        return l.errorf("unterminated raw string in shortcode parameter-argument: '%s'", l.current())
                }
        }

diff --git a/parser/pageparser/pageparser_shortcode_test.go b/parser/pageparser/pageparser_shortcode_test.go
index 8d1ebda2f7c2071a8e15cf01dd33fce97c581b8b..b8bf5f7276dacf7db3486de054aedf942fce8256 100644 (file)
--- a/parser/pageparser/pageparser_shortcode_test.go
+++ b/parser/pageparser/pageparser_shortcode_test.go
@@ -89,6 +89,12 @@ var shortCodeLexerTests = []lexerTest{
                tstLeftNoMD, tstSC1, nti(tScParam, "-ziL-.%QigdO-4"), tstRightNoMD, tstEOF}},
        {"raw string", `{{< sc1` + "`" + "Hello World" + "`" + ` >}}`, []Item{
                tstLeftNoMD, tstSC1, nti(tScParam, "Hello World"), tstRightNoMD, tstEOF}},
+       {"raw string with newline", `{{< sc1` + "`" + `Hello 
+       World` + "`" + ` >}}`, []Item{
+               tstLeftNoMD, tstSC1, nti(tScParam, `Hello 
+       World`), tstRightNoMD, tstEOF}},
+       {"raw string with escape character", `{{< sc1` + "`" + `Hello \b World` + "`" + ` >}}`, []Item{
+               tstLeftNoMD, tstSC1, nti(tScParam, `Hello \b World`), tstRightNoMD, tstEOF}},
        {"two params", `{{< sc1 param1   param2 >}}`, []Item{
                tstLeftNoMD, tstSC1, tstParam1, tstParam2, tstRightNoMD, tstEOF}},
        // issue #934