Templates: Support elsif in addition to elseif (#2199)

korlibs · Mar 13, 2024 · b1bc0ae · b1bc0ae
1 parent 3b5e345
commit b1bc0ae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/korlibs-template/src/korlibs/template/KorteDefaults.kt b/korlibs-template/src/korlibs/template/KorteDefaults.kt
@@ -264,7 +264,7 @@ object KorteDefaultTags {
 
         for (part in chunks) {
             when (part.tag.name) {
-                "if", "elseif", "unless", "elseunless" -> branches += Branch(part)
+                "if", "elseif", "elsif", "unless", "elseunless" -> branches += Branch(part)
                 "else" -> elseBranch = part.body
             }
         }
@@ -281,8 +281,8 @@ object KorteDefaultTags {
         return node
     }
 
-    val If = KorteTag("if", setOf("else", "elseif", "elseunless"), setOf("end", "endif")) { BuildIf(isIf = true) }
-    val Unless = KorteTag("unless", setOf("else", "elseif", "elseunless"), setOf("end", "endunless")) { BuildIf(isIf = true) }
+    val If = KorteTag("if", setOf("else", "elseif", "elsif", "elseunless"), setOf("end", "endif")) { BuildIf(isIf = true) }
+    val Unless = KorteTag("unless", setOf("else", "elseif", "elsif", "elseunless"), setOf("end", "endunless")) { BuildIf(isIf = true) }
 
     val Import = KorteTag("import", setOf(), null) {
         val part = chunks.first()

diff --git a/korlibs-template/test/korlibs/template/TemplateTest.kt b/korlibs-template/test/korlibs/template/TemplateTest.kt
@@ -162,7 +162,7 @@ class TemplateTest : BaseTest() {
     @Test
     fun testSimpleElseIf() = suspendTest {
         val tpl =
-            KorteTemplate("{% if v == 1 %}one{% elseif v == 2 %}two{% elseif v < 5 %}less than five{% elseif v > 8 %}greater than eight{% else %}other{% end %}")
+            KorteTemplate("{% if v == 1 %}one{% elseif v == 2 %}two{% elsif v < 5 %}less than five{% elseif v > 8 %}greater than eight{% else %}other{% end %}")
         assertEquals("one", tpl("v" to 1))
         assertEquals("two", tpl("v" to 2))
         assertEquals("less than five", tpl("v" to 3))