fix: Fix liquid conditions

diplodoc-platform · Jun 5, 2024 · 39d6be1 · 39d6be1
1 parent 5a0e8aa
commit 39d6be1
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 1 deletion.
diff --git a/src/transform/liquid/conditions.ts b/src/transform/liquid/conditions.ts
@@ -205,7 +205,7 @@ function inlineConditions(
 
     return {
         result: start + result + end,
-        lastIndex: start.length + result.length,
+        lastIndex: start.length + result.length - tailLinebreak(ifTag.rawEnd).length,
         ifCon,
     };
 }

diff --git a/test/liquid/conditions.test.ts b/test/liquid/conditions.test.ts
@@ -217,6 +217,42 @@ describe('Conditions', () => {
                 {% endnote %}
             `);
         });
+
+        test('Falsy block condition after truthly block condition', () => {
+            expect(
+                conditions(
+                    trim`
+                        Start
+
+                        Before
+                        {% if product == "A" %}
+                        Truthly
+                        {% endif %}
+                        {% if product == "B" %}
+                        Falsy
+                        {% endif %}
+                        After
+
+                        End
+                `,
+                    {
+                        product: 'A',
+                    },
+                    '',
+                    {
+                        sourceMap: {},
+                    },
+                ),
+            ).toEqual(trim`
+                Start
+
+                Before
+                Truthly
+                After
+
+                End
+            `);
+        });
     });
 
     describe('Conditions', () => {