fix: Fix liquid conditions

diplodoc-platform · May 29, 2024 · 3f7603d · 3f7603d
1 parent 8190acb
commit 3f7603d
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/src/transform/liquid/conditions.ts b/src/transform/liquid/conditions.ts
@@ -225,7 +225,7 @@ export = function conditions(
 
     // Consumes all between curly braces
     // and all closest upon to first linebreak before and after braces.
-    const R_LIQUID = /((?:\n\s*)?{%-?([\s\S]*?)-?%}(?:\s*\n)?)/g;
+    const R_LIQUID = /((?:\n[\t ]*)?{%-?([\s\S]*?)-?%}(?:[\t ]*\n)?)/g;
 
     let match;
     while ((match = R_LIQUID.exec(input)) !== null) {

diff --git a/test/liquid/conditions.test.ts b/test/liquid/conditions.test.ts
@@ -522,6 +522,37 @@ describe('Conditions', () => {
                             Postfix
                         `);
             });
+
+            test('Condition inside the cut block with multiple linebreaks', () => {
+                expect(
+                    conditions(
+                        trim`
+                    {% cut "Title" %}
+
+                    {% if locale == 'ru' %}
+
+                    a
+
+                    {% endif %}
+
+                    {% endcut %}
+                `,
+                        {locale: 'ru'},
+                        '',
+                        {
+                            sourceMap: {},
+                        },
+                    ),
+                ).toEqual(trim`
+                    {% cut "Title" %}
+
+
+                    a
+
+
+                    {% endcut %}
+            `);
+            });
         });
     });