[1.6.x] Fix whitespaces after else{...} and elseif{...} is not shown

[yousuketto]

The parser does not recognize whitespace after else {...} as a plain, so it is not showing.

Refs #711

[mkurz]

LGTM, however I think the last whitespaceNoBreak? has to be removed now from

twirl/parser/src/main/scala/play/twirl/parser/TwirlParser.scala

Line 75 in 6ee9211

* elseCall : whitespaceNoBreak? "else" expressionPart whitespaceNoBreak?

or not?

Or actually... isn't following correct actually?

  *   elseCall : whitespaceNoBreak? "else" whitespaceNoBreak? expressionPart

[yousuketto]

Oh, I didn't notice the document. As you say, it has to be changed as the following. Thanks.

  *   elseCall : whitespaceNoBreak? "else" whitespaceNoBreak? expressionPart

[yousuketto]

Furthermore, I noticed that elseIfCall has the same bug as elseCall. I'll fix it too.

@(b: Boolean, b2: Boolean)
x@if(b) {ifbody} <-whitespace
x@if(b) {ifbody} else if(b2) {elseifbody} <-whitespace

scala> com.github.yousuketto.txt.sample(true, false)
val res0: play.twirl.api.TxtFormat.Appendable =
xifbody <-whitespace
xifbody<-whitespace

scala> com.github.yousuketto.txt.sample(false, false)
val res1: play.twirl.api.TxtFormat.Appendable =
x <-whitespace
x<-whitespace

scala> com.github.yousuketto.txt.sample(false, true)
val res2: play.twirl.api.TxtFormat.Appendable =
x <-whitespace
xelseifbody<-whitespace

[yousuketto]

I also fixed a bug in elseIfCall. If we need to split this pull request, I'll split it. Please let me know.

[mkurz]

Perfect, thanks!

[mkurz]

@Mergifyio backport main

[mergify]

backport main

✅ Backports have been created

• #713 [main] Fix whitespaces after else{...} and elseif{...} is not shown (backport #712) by @yousuketto has been created for branch main

[mkurz]

Thanks! This is now included in just released twirl 1.6.3 and 2.0.2

• https://github.com/playframework/twirl/releases/tag/1.6.3
• https://github.com/playframework/twirl/releases/tag/2.0.2

[yousuketto]

It's so helpful. Thanks for releasing.