parser/pageparser: Fix shortcode nesting regression

This reverts commit a133393.

While that commit fixed a bug, it introduced a worse one.

Closes #14054

Author: bep

parser/pageparser/pagelexer_shortcode.go

@@ -263,12 +263,11 @@ Loop:
 				}
 				l.openShortcodes[word] = false
 				lookForEnd = true
-			} else {
-				l.openShortcodes[word] = true
 			}
 
 			l.closingState = 0
 			l.currShortcodeName = word.Value()
+			l.openShortcodes[word] = true
 			l.elementStepNum++
 			if l.isInline {
 				l.emit(tScNameInline)

parser/pageparser/pageparser_shortcode_test.go

@@ -27,7 +27,6 @@ var (
 	tstRightMD   = nti(tRightDelimScWithMarkup, "%}}")
 	tstSCClose   = nti(tScClose, "/")
 	tstSC1       = nti(tScName, "sc1")
-	tstSCAnother = nti(tScName, "another")
 	tstSC1Inline = nti(tScNameInline, "sc1.inline")
 	tstSC2Inline = nti(tScNameInline, "sc2.inline")
 	tstSC2       = nti(tScName, "sc2")
@@ -75,10 +74,6 @@ var shortCodeLexerTests = []lexerTest{
 		tstLeftNoMD, tstSC1, tstRightNoMD, tstLeftNoMD, tstSCClose,
 		nti(tError, "closing tag for shortcode 'another' does not match start tag"),
 	}, nil},
-	{"close wrong, repeated", `{{< sc1 >}}{{< another >}}{{< /another >}}{{< /another >}}`, []typeText{
-		tstLeftNoMD, tstSC1, tstRightNoMD, tstLeftNoMD, tstSCAnother, tstRightNoMD, tstLeftNoMD, tstSCClose, tstSCAnother, tstRightNoMD, tstLeftNoMD, tstSCClose,
-		nti(tError, "closing tag for shortcode 'another' does not match start tag"),
-	}, nil},
 	{"close, but no open, more", `{{< sc1 >}}{{< /sc1 >}}{{< /another >}}`, []typeText{
 		tstLeftNoMD, tstSC1, tstRightNoMD, tstLeftNoMD, tstSCClose, tstSC1, tstRightNoMD, tstLeftNoMD, tstSCClose,
 		nti(tError, "closing tag for shortcode 'another' does not match start tag"),