Fix: QSSParser to strip selector comments and add full property assertions in test.

Author: Onimock

src/qss_parser/qss_parser.py

@@ -275,7 +275,7 @@ def __init__(self, selector: str) -> None:
         Args:
             selector (str): The CSS selector for this rule.
         """
-        self.selector: str = selector.strip()
+        self.selector: str = SelectorUtils.strip_comments(selector).strip()
         self.properties: List[QSSProperty] = []
         self.object_name: Optional[str] = None
         self.class_name: Optional[str] = None
@@ -661,6 +661,23 @@ def validate_selector_syntax(selector: str, line_num: int) -> List[str]:
 
         return errors
 
+    @staticmethod
+    def strip_comments(line: str) -> str:
+        """
+        Remove inline and block comments from a QSS line.
+
+        Args:
+            line (str): The input line to process.
+
+        Returns:
+            str: The line with comments removed.
+        """
+        while "/*" in line and "*/" in line:
+            start = line.index("/*")
+            end = line.index("*/", start) + 2
+            line = line[:start] + line[end:]
+        return line.strip()
+
 
 class QSSFormatter:
     """
@@ -983,7 +1000,7 @@ def process_line(
         Returns:
             bool: True if the line was processed by this plugin, False otherwise.
         """
-        line = line.strip()
+        line = SelectorUtils.strip_comments(line)
         if not line or state.in_comment or state.in_variables:
             return False
 
@@ -1004,7 +1021,7 @@ def process_line(
         if line.endswith("{") and not state.in_rule:
             return self._start_rule(line, state, variable_manager)
 
-        if line == "}" and state.in_rule:
+        if line.strip() == "}" and state.in_rule:
             return self._end_rule(state, variable_manager)
 
         if line.endswith("{") and state.in_rule:
@@ -1034,7 +1051,7 @@ def _start_rule(
         """
         state.buffer = ""
         state.property_lines = []
-        selector_part = line[:-1].strip()
+        selector_part = SelectorUtils.strip_comments(line.split("{")[0].strip())
         if selector_part:
             normalized_selector = SelectorUtils.normalize_selector(selector_part)
             selectors = [s.strip() for s in normalized_selector.split(",") if s.strip()]
@@ -1262,7 +1279,7 @@ def process_line(
         Returns:
             bool: True if the line was processed as a property, False otherwise.
         """
-        line = line.strip()
+        line = SelectorUtils.strip_comments(line).strip()
         if not state.in_rule or state.in_comment or state.in_variables:
             return False
         if line.endswith("{") or line == "}":
@@ -1526,12 +1543,13 @@ def _process_line(self, line: str) -> None:
         if not line:
             return
 
+        clean_line = SelectorUtils.strip_comments(line)
         if (
             not self._state.in_rule
             and not self._state.in_variables
             and not self._state.in_comment
-            and ":" in line
-            and line.endswith(";")
+            and ":" in clean_line
+            and clean_line.endswith(";")
         ):
             self.dispatch_error(
                 f"Error on line {self._state.current_line}: Property outside block: {line}"

tests/test_qss_parser.py

@@ -2,7 +2,7 @@
 import os
 import sys
 import unittest
-from typing import List, Set, Tuple
+from typing import Any, List, Set, Tuple
 from unittest.mock import Mock
 
 sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "src")))
@@ -1317,7 +1317,7 @@ def test_get_style_for_multiple_selectors_separate_with_comma_in_each_line_with_
         """
         qss: str = """
         #myButton:hover,
-        QFrame:disabled, 
+        QFrame:disabled,
         #secondButton QPushButton,
         #anyButton QCheckBox::drop-down:disabled {
             color: red;
@@ -1777,7 +1777,7 @@ def test_to_string_comments_bigger_than_a_line(self) -> None:
             height: 15px;
             border-radius: 10px;
         }
-        /* Another comment 
+        /* Another comment
         more comment*/
         #customButton {
             qproperty-enabled: false;
@@ -1809,6 +1809,124 @@ def test_to_string_comments_bigger_than_a_line(self) -> None:
         )
         self.assertEqual(self.errors, [], "Comments-only QSS should produce no errors")
 
+    def test_to_string_comments_in_single_line_inside_selector(self) -> None:
+        """
+        Test parsing QSS with comments in single and multi-line formats inside and outside selectors,
+        ensuring rules are correctly parsed and comments are excluded from output.
+        """
+        self.maxDiff = None
+        qss: str = """
+        /* This is valid but not include on parsing */
+        /* Another comment
+        This is valid but not include on parsing
+        */
+        #secondButton QPushButton {     /* This is valid but not include on parsing */
+            color: red;
+            width: 15px; /*This is valid but not include on parsing */
+            height: 15px;
+            border-radius: 10px;
+            /*comment here */
+        }
+        /*This is valid but not include on parsing*/
+        #customButton {
+            qproperty-enabled: false;
+            background: gray;
+        } /*This is valid but not include on parsing*/
+        /*more comment */
+        """
+        expected = """#secondButton QPushButton {
+    color: red;
+    width: 15px;
+    height: 15px;
+    border-radius: 10px;
+}
+
+#customButton {
+    qproperty-enabled: false;
+    background: gray;
+}
+"""
+        self.parser.parse(qss)
+        self.assertEqual(
+            len(self.parser._state.rules),
+            2,
+            "QSS with comments should result in two rules",
+        )
+        rules_1 = self.parser._state.rules[0]
+        rules_2 = self.parser._state.rules[1]
+        self.assertEqual(
+            rules_1.class_name,
+            "QPushButton",
+            "Expected className for first rule to be QPushButton",
+        )
+        self.assertEqual(
+            rules_1.object_name,
+            "secondButton",
+            "Expected objectName for first rule to be secondButton",
+        )
+        self.assertEqual(
+            rules_2.class_name,
+            None,
+            "Expected className for second rule to be None",
+        )
+        self.assertEqual(
+            rules_2.object_name,
+            "customButton",
+            "Expected objectName for second rule to be customButton",
+        )
+        self.assertEqual(
+            len(rules_1.properties),
+            4,
+            "Expected 4 properties for first rule",
+        )
+        self.assertEqual(
+            len(rules_2.properties),
+            2,
+            "Expected 2 properties for second rule",
+        )
+        # Assertions for all properties of first rule
+        self.assertEqual(
+            f"{rules_1.properties[0].name}: {rules_1.properties[0].value}",
+            "color: red",
+            "Expected first property of first rule to be 'color: red'",
+        )
+        self.assertEqual(
+            f"{rules_1.properties[1].name}: {rules_1.properties[1].value}",
+            "width: 15px",
+            "Expected second property of first rule to be 'width: 15px'",
+        )
+        self.assertEqual(
+            f"{rules_1.properties[2].name}: {rules_1.properties[2].value}",
+            "height: 15px",
+            "Expected third property of first rule to be 'height: 15px'",
+        )
+        self.assertEqual(
+            f"{rules_1.properties[3].name}: {rules_1.properties[3].value}",
+            "border-radius: 10px",
+            "Expected fourth property of first rule to be 'border-radius: 10px'",
+        )
+        # Assertions for all properties of second rule
+        self.assertEqual(
+            f"{rules_2.properties[0].name}: {rules_2.properties[0].value}",
+            "qproperty-enabled: false",
+            "Expected first property of second rule to be 'qproperty-enabled: false'",
+        )
+        self.assertEqual(
+            f"{rules_2.properties[1].name}: {rules_2.properties[1].value}",
+            "background: gray",
+            "Expected second property of second rule to be 'background: gray'",
+        )
+        self.assertEqual(
+            self.parser.to_string(),
+            expected,
+            "Expected formatted QSS string to match",
+        )
+        self.assertEqual(
+            self.errors,
+            [],
+            "QSS with comments should produce no errors",
+        )
+
     def test_to_string_comments_bigger_than_a_line_and_single_line(self) -> None:
         """
         Test parsing QSS with only comments in bigger than a line and in a single line.
@@ -1826,7 +1944,7 @@ def test_to_string_comments_bigger_than_a_line_and_single_line(self) -> None:
             border-radius: 10px;
         }
         /*More single-line comment*/
-        /* Another comment 
+        /* Another comment
         more comment*/
         #customButton {
             qproperty-enabled: false;
@@ -2030,7 +2148,7 @@ def test_event_qproperty_defined(self) -> None:
         self.assertEqual(
             len(rules_added), 3, "Should trigger rule_added for each qproperty rule"
         )
-        selectors: set = {rule.selector for rule in rules_added}
+        selectors: Set[Any] = {rule.selector for rule in rules_added}
         self.assertEqual(
             selectors,
             {