Ignore sections in macro definitions

Signed-off-by: Nikola Forró <[email protected]>

Author: nforro

specfile/sections.py

@@ -13,6 +13,7 @@
     SIMPLE_SCRIPT_SECTIONS,
 )
 from specfile.formatter import formatted
+from specfile.macro_definitions import MacroDefinitions
 from specfile.macros import Macros
 from specfile.options import Options
 
@@ -258,12 +259,20 @@ def split_id(line):
                 return name, options, delimiter, separator, content
             return tokens[0], None, "", separator, content
 
+        excluded_lines = []
+        macro_definitions = MacroDefinitions.parse(lines)
+        for md in macro_definitions:
+            position = md.get_position(macro_definitions)
+            excluded_lines.append(range(position, position + len(md.get_raw_data())))
         section_id_regexes = [
-            re.compile(rf"^%{re.escape(n)}(\s+.*$|$)", re.IGNORECASE)
+            re.compile(rf"^%{re.escape(n)}(\s+.*(?<!\\)$|$)", re.IGNORECASE)
             for n in SECTION_NAMES
         ]
         section_starts = []
         for i, line in enumerate(lines):
+            # section can not start inside macro definition body
+            if any(i in r for r in excluded_lines):
+                continue
             if line.startswith("%"):
                 for r in section_id_regexes:
                     if r.match(line):

tests/unit/test_sections.py

@@ -103,6 +103,34 @@ def test_parse_invalid_name():
     assert sections.description[2] == "%description(fr)"
 
 
+def test_parse_macro_definitions():
+    sections = Sections.parse(
+        [
+            "%package -n test",
+            "Summary: Subpackage test",
+            "",
+            "%description -n test",
+            "Subpackage test.",
+            "",
+            "%define template1()\\",
+            "%package -n %{1}\\",
+            "Summary: Subpackage %{1}\\",
+            "\\",
+            "%description -n %{1}\\",
+            "Subpackage %{1}.",
+            "",
+            "%define template2() %{expand:",
+            "%package -n %{1}",
+            "Summary: Subpackage %{1}",
+            "",
+            "%description -n %{1}",
+            "Subpackage %{1}.}",
+        ]
+    )
+    assert len(sections) == 3
+    assert sections[1].id == "package -n test"
+
+
 def test_get_raw_data():
     sections = Sections(
         [