Fix: incorrect semicolon validation in single-line QSS rule parsing

Author: Onimock

src/qss_parser/qss_parser.py

@@ -1182,7 +1182,7 @@ def _process_complete_rule(
             if any("Duplicate selector" in error for error in errors):
                 seen_selectors = set()
                 unique_selectors = []
-                for sel in state.current_selectors:
+                for sel in selectors:
                     if sel not in seen_selectors:
                         seen_selectors.add(sel)
                         unique_selectors.append(sel)
@@ -1197,15 +1197,12 @@ def _process_complete_rule(
         state.current_rules = [QSSRule(sel) for sel in selectors]
         if properties.strip():
             prop_lines = [p.strip() for p in properties.split(";") if p.strip()]
-            for i, prop_line in enumerate(prop_lines[:-1]):
-                if not prop_line.endswith(";"):
-                    self._error_handler.dispatch_error(
-                        f"Error on line {state.current_line}: Property missing ';': {prop_line}"
-                    )
+            for i, prop_line in enumerate(prop_lines):
+                if not prop_line:
                     continue
                 try:
                     self._property_processor.process_property(
-                        prop_line,
+                        prop_line + ";",
                         state.current_rules,
                         variable_manager,
                         state.current_line,
@@ -1214,25 +1211,6 @@ def _process_complete_rule(
                     self._error_handler.dispatch_error(
                         f"Error on line {state.current_line}: Invalid property: {prop_line} ({str(e)})"
                     )
-            last_prop = prop_lines[-1].strip()
-            if last_prop:
-                parts = last_prop.split(":", 1)
-                if len(parts) != 2 or not parts[0].strip() or not parts[1].strip():
-                    self._error_handler.dispatch_error(
-                        f"Error on line {state.current_line}: Invalid last property: {last_prop}"
-                    )
-                else:
-                    try:
-                        self._property_processor.process_property(
-                            last_prop + (";" if not last_prop.endswith(";") else ""),
-                            state.current_rules,
-                            variable_manager,
-                            state.current_line,
-                        )
-                    except Exception as e:
-                        self._error_handler.dispatch_error(
-                            f"Error on line {state.current_line}: Invalid last property: {last_prop} ({str(e)})"
-                        )
 
         for rule in state.current_rules:
             if rule.properties:

tests/test_qss_parser.py

@@ -491,6 +491,54 @@ def test_parse_invalid_pseudo_state(self) -> None:
         )
         self.assertEqual(self.parser.to_string(), "", "Should return empty string")
 
+    def test_parse_variables_block_single_line(self) -> None:
+        """
+        Test parsing a single-line QSS rule with multiple properties and variables.
+        """
+        qss: str = """
+        @variables {
+            --primary-color: #ffffff;
+            --border-radius: 14px;
+        }
+        #extraCloseColumnBtn { background-color: rgba(248, 248, 242, 0); border: none; border-radius: var(--border-radius); color: var(--primary-color); }
+        """
+        self.parser.parse(qss)
+        self.assertEqual(len(self.parser._state.rules), 1, "Should parse one rule")
+        rule = self.parser._state.rules[0]
+        self.assertEqual(rule.selector, "#extraCloseColumnBtn")
+        self.assertEqual(len(rule.properties), 4, "Should parse all four properties")
+        self.assertEqual(rule.properties[0].name, "background-color")
+        self.assertEqual(rule.properties[0].value, "rgba(248, 248, 242, 0)")
+        self.assertEqual(rule.properties[1].name, "border")
+        self.assertEqual(rule.properties[1].value, "none")
+        self.assertEqual(rule.properties[2].name, "border-radius")
+        self.assertEqual(rule.properties[2].value, "14px")
+        self.assertEqual(rule.properties[3].name, "color")
+        self.assertEqual(rule.properties[3].value, "#ffffff")
+        self.assertEqual(self.errors, [], "Single-line rule should produce no errors")
+
+    def test_parse_single_line_multiple_properties(self) -> None:
+        """
+        Test parsing a single-line QSS rule with multiple properties.
+        """
+        qss = """
+        #extraCloseColumnBtn { background-color: rgba(248, 248, 242, 0); border: none; border-radius: 14px; color: #ffffff; }
+        """
+        self.parser.parse(qss)
+        self.assertEqual(len(self.parser._state.rules), 1, "Should parse one rule")
+        rule = self.parser._state.rules[0]
+        self.assertEqual(rule.selector, "#extraCloseColumnBtn")
+        self.assertEqual(len(rule.properties), 4, "Should parse all four properties")
+        self.assertEqual(rule.properties[0].name, "background-color")
+        self.assertEqual(rule.properties[0].value, "rgba(248, 248, 242, 0)")
+        self.assertEqual(rule.properties[1].name, "border")
+        self.assertEqual(rule.properties[1].value, "none")
+        self.assertEqual(rule.properties[2].name, "border-radius")
+        self.assertEqual(rule.properties[2].value, "14px")
+        self.assertEqual(rule.properties[3].name, "color")
+        self.assertEqual(rule.properties[3].value, "#ffffff")
+        self.assertEqual(self.errors, [], "Single-line rule should produce no errors")
+
 
 class TestQSSParserStyleSelection(unittest.TestCase):
     def setUp(self) -> None:
@@ -1076,6 +1124,63 @@ def test_get_styles_with_variables_and_fixed_properties(self) -> None:
             errors, [], "Valid variables and properties should produce no errors"
         )
 
+    def test_get_styles_for_variables_block_single_line(self) -> None:
+        """
+        Test get style for a single-line QSS rule with multiple properties and variables.
+        """
+        qss: str = """
+        @variables {
+            --primary-color: #ffffff;
+            --border-radius: 14px;
+        }
+        #extraCloseColumnBtn QPushButton { background-color: rgba(248, 248, 242, 0); border: none; border-radius: var(--border-radius); color: var(--primary-color); }
+        """
+        errors: List[str] = []
+        self.parser.on(ParserEvent.ERROR_FOUND, lambda error: errors.append(error))
+        self.parser.parse(qss)
+        widget: Mock = Mock()
+        widget.objectName.return_value = "extraCloseColumnBtn"
+        widget.metaObject.return_value.className.return_value = "QPushButton"
+        stylesheet: str = self.parser.get_styles_for(widget)
+
+        expected: str = """#extraCloseColumnBtn QPushButton {
+    background-color: rgba(248, 248, 242, 0);
+    border: none;
+    border-radius: 14px;
+    color: #ffffff;
+}
+"""
+        self.assertEqual(stylesheet.strip(), expected.strip())
+        self.assertEqual(
+            errors, [], "Valid variables and properties should produce no errors"
+        )
+
+    def test_get_styles_for_single_line_multiple_properties(self) -> None:
+        """
+        Test get style for a single-line QSS rule with multiple properties.
+        """
+        qss = """
+        #extraCloseColumnBtn, QLabel { background-color: rgba(248, 248, 242, 0); border: none; border-radius: 14px; color: #ffffff; }
+        """
+        errors: List[str] = []
+        self.parser.on(ParserEvent.ERROR_FOUND, lambda error: errors.append(error))
+        self.parser.parse(qss)
+        widget: Mock = Mock()
+        widget.objectName.return_value = "extraCloseColumnBtn"
+        widget.metaObject.return_value.className.return_value = "QPushButton"
+        stylesheet: str = self.parser.get_styles_for(widget)
+        expected: str = """#extraCloseColumnBtn {
+    background-color: rgba(248, 248, 242, 0);
+    border: none;
+    border-radius: 14px;
+    color: #ffffff;
+}
+"""
+        self.assertEqual(stylesheet.strip(), expected.strip())
+        self.assertEqual(
+            errors, [], "Valid variables and properties should produce no errors"
+        )
+
 
 class TestQSSParserEvents(unittest.TestCase):
     def setUp(self) -> None:
@@ -1312,6 +1417,48 @@ def test_to_string_complex_nested_selectors_with_attribute_selector_space_invali
             "Invalid attribute selector should produce error",
         )
 
+    def test_to_string_for_variables_block_single_line(self) -> None:
+        """
+        Test to_string a single-line QSS rule with multiple properties and variables.
+        """
+        qss: str = """
+        @variables {
+            --primary-color: #ffffff;
+            --border-radius: 14px;
+        }
+        #extraCloseColumnBtn QPushButton { background-color: rgba(248, 248, 242, 0); border: none; border-radius: var(--border-radius); color: var(--primary-color); }
+        """
+        self.parser.parse(qss)
+        expected: str = """#extraCloseColumnBtn QPushButton {
+    background-color: rgba(248, 248, 242, 0);
+    border: none;
+    border-radius: 14px;
+    color: #ffffff;
+}
+"""
+        self.assertEqual(self.parser.to_string(), expected, "Should to string")
+        self.assertEqual(self.errors, [], "Single-line rule should produce no errors")
+
+    def test_to_string_for_single_line_multiple_properties(self) -> None:
+        """
+        Test to_string a single-line QSS rule with multiple properties.
+        """
+        qss = """
+        #extraCloseColumnBtn { background-color: rgba(248, 248, 242, 0); border: none; border-radius: 14px; color: #ffffff; }
+        """
+        self.parser.parse(qss)
+        expected: str = """#extraCloseColumnBtn {
+    background-color: rgba(248, 248, 242, 0);
+    border: none;
+    border-radius: 14px;
+    color: #ffffff;
+}
+"""
+        self.assertEqual(self.parser.to_string().strip(), expected.strip())
+        self.assertEqual(
+            self.errors, [], "Valid variables and properties should produce no errors"
+        )
+
 
 class TestQSSParserQProperty(unittest.TestCase):
     def setUp(self) -> None: