ref: 59df7db764d011b6e082d11d4660e9c8833a3b75
parent: 8b0d16b8d911026ca43057b08c9365c24e4228d8
author: Bjørn Erik Pedersen <[email protected]>
date: Tue Sep 27 17:11:34 EDT 2016
Fix half-broken self-closing shortcodes Fixes #2498
--- a/hugolib/shortcodeparser.go
+++ b/hugolib/shortcodeparser.go
@@ -345,6 +345,7 @@
}
func lexShortcodeRightDelim(l *pagelexer) stateFunc {+ l.closingState = 0
l.pos += pos(len(l.currentRightShortcodeDelim()))
l.emit(l.currentRightShortcodeDelimItem())
return lexTextOutsideShortcodes
--- a/hugolib/shortcodeparser_test.go
+++ b/hugolib/shortcodeparser_test.go
@@ -81,6 +81,18 @@
// issue #934
{"self-closing", `{{< sc1 />}}`, []item{tstLeftNoMD, tstSC1, tstSCClose, tstRightNoMD, tstEOF}},
+ // Issue 2498
+ {"multiple self-closing", `{{< sc1 />}}{{< sc1 />}}`, []item{+ tstLeftNoMD, tstSC1, tstSCClose, tstRightNoMD,
+ tstLeftNoMD, tstSC1, tstSCClose, tstRightNoMD, tstEOF}},
+ {"self-closing with param", `{{< sc1 param1 />}}`, []item{+ tstLeftNoMD, tstSC1, tstParam1, tstSCClose, tstRightNoMD, tstEOF}},
+ {"multiple self-closing with param", `{{< sc1 param1 />}}{{< sc1 param1 />}}`, []item{+ tstLeftNoMD, tstSC1, tstParam1, tstSCClose, tstRightNoMD,
+ tstLeftNoMD, tstSC1, tstParam1, tstSCClose, tstRightNoMD, tstEOF}},
+ {"multiple different self-closing with param", `{{< sc1 param1 />}}{{< sc2 param1 />}}`, []item{+ tstLeftNoMD, tstSC1, tstParam1, tstSCClose, tstRightNoMD,
+ tstLeftNoMD, tstSC2, tstParam1, tstSCClose, tstRightNoMD, tstEOF}},
{"nested simple", `{{< sc1 >}}{{< sc2 >}}{{< /sc1 >}}`, []item{tstLeftNoMD, tstSC1, tstRightNoMD,
tstLeftNoMD, tstSC2, tstRightNoMD,
@@ -140,11 +152,10 @@
}
func TestShortcodeLexer(t *testing.T) {- for _, test := range shortCodeLexerTests {-
+ for i, test := range shortCodeLexerTests {items := collect(&test)
if !equal(items, test.items) {- t.Errorf("%s: got\n\t%v\nexpected\n\t%v", test.name, items, test.items)+ t.Errorf("[%d] %s: got\n\t%v\nexpected\n\t%v", i, test.name, items, test.items)}
}
}