fix_too_many_endif_buggy_43 (#35)

fix_too_many_endif_buggy : issue 43

README.md

@@ -839,6 +839,9 @@ For trying to fix these problems, you can try:
 
 <a name="versions"></a>Versions
 -------------------------------
+
+- v1.6.1 : 2024-04-12 : bugfix
+  - fix the issue https://github.com/Probesys/lotemplate/issues/34 : too many endif buggy
 - v1.6.0 : 2024-04-11
   - allow put variables inside headers and footers
   - fix a bug when a variable is both inside the text content and inside a table (it should not arrive, but it is fixed)

lotemplate/Statement/IfStatement.py

@@ -65,9 +65,11 @@ class IfStatement:
     end_regex = r'\[\s*endif\s*\]'
 
     start_regex_light = r"""
-        \[\s*if\s*                         # [if detection
-          (?:(?:.*?)\[\s*for(?:.*?)\])?    # [foritem xxx] et [forindex] detection
-          (?:.*?)                          # anything but not too greedy
+        \[\s*if\s*                    # [if detection
+          (?:[^\[\]]*)                # anything before the foritem or forindex
+                                      # ex: [if $foo.[forindex] == PP]
+          (?:\[\s*for(?:.*?)\])?      # [foritem xxx] et [forindex] detection
+          (?:[^\]]*)                  # anything but not too greedy
         \]
     """
     # remove comments, spaces and newlines

lotemplate/unittest/files/content/too_many_endif_strange.expected.txt

@@ -0,0 +1,5 @@
+Test SAS
+
+  nom= nom1, titre=titre1 ;    
+
+

lotemplate/unittest/files/content/too_many_endif_strange.json

@@ -0,0 +1,21 @@
+{
+  "odoo(coop_forme_juridique)": {
+    "type": "text",
+    "value": "SAS"
+  },
+  "odoo(mandataires_sas)": {
+    "type": "array",
+    "value": [
+      {
+        "type": "PP",
+        "nom": "nom1",
+        "titre": "titre1"
+      },
+      {
+        "type": "type2",
+        "nom": "nom2",
+        "titre": "titre2"
+      }
+    ]
+  }
+}

lotemplate/unittest/test_content.py

@@ -131,5 +131,8 @@ def test_counter(self):
     def test_text_var_in_header(self):
         self.assertTrue(compare_files('text_var_in_header', 'pdf'))
 
+    def test_too_many_endif_strange(self):
+        self.assertTrue(compare_files('too_many_endif_strange'))
+
     def test_debug(self):
         self.assertTrue(compare_files('debug'))