sarj-python-lint 1.26.2__tar.gz → 1.26.3__tar.gz

{sarj_python_lint-1.26.2 → sarj_python_lint-1.26.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: sarj-python-lint
-Version: 1.26.2
+Version: 1.26.3
 Summary: Custom Python lint rules — AST-based, pre-commit-friendly, hypermodern defaults
 Project-URL: Homepage, https://code-standards.sarj.ai/rules/python/
 Project-URL: Documentation, https://code-standards.sarj.ai/rules/python/

{sarj_python_lint-1.26.2 → sarj_python_lint-1.26.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sarj-python-lint"
-version = "1.26.2"
+version = "1.26.3"
 description = "Custom Python lint rules — AST-based, pre-commit-friendly, hypermodern defaults"
 readme = "README.md"
 authors = [{ name = "sarj-ai" }]

{sarj_python_lint-1.26.2 → sarj_python_lint-1.26.3}/src/sarj_python_lint/rule_base.py

@@ -37,7 +37,7 @@ TESTS_DIR: Final = "packages/python/tests/rules"
 
 # Keep SARJ suppressions separate because Ruff removes unknown `noqa` codes.
 _SARJ_NOQA_RE = re.compile(
-    r"#\s*sarj-noqa(?::\s*([A-Za-z0-9_, ]+))?",
+    r"#\s*sarj-noqa\b(?::\s*([A-Za-z0-9_, ]+))?",
     re.IGNORECASE,
 )
 
@@ -49,12 +49,25 @@ def is_suppressed(source_lines: Sequence[str], line: int, code: str) -> bool:
     m = _SARJ_NOQA_RE.search(text)
     if not m:
         return False
+    from sarj_python_lint.rules._suppression_comments import comment_lines  # ruff: ignore[import-outside-top-level] -- comment scanner depends on rule_base.
+
+    comment = comment_lines(tuple(source_lines)).get(line, "")
+    m = _SARJ_NOQA_RE.search(comment)
+    if m is None:
+        return False
     codes_str = m.group(1)
-    if not codes_str:
-        # A bare sarj-noqa intentionally suppresses every SARJ code on its line.
-        return True
-    codes = {val.upper() for c in codes_str.split(",") if (val := c.strip())}
-    return code.upper() in codes
+    trailing = comment[m.end() :]
+    if codes_str is None:
+        # A complete bare marker preserves the existing all-codes waiver contract.
+        return not (trailing and (not trailing[0].isspace() or trailing.lstrip().startswith(":")))
+    reason = trailing.lstrip()
+    single_dash_reason = reason.startswith("-") and (codes_str[-1:].isspace() or trailing[:1].isspace())
+    if reason and not reason.startswith(("--", "—", "–")) and not single_dash_reason:
+        return False
+    parts = tuple(part.strip() for part in codes_str.split(","))
+    if any(not part for part in parts):
+        return False
+    return code.upper() in {part.upper() for part in parts}
 
 
 class ColumnEncoding(StrEnum):

{sarj_python_lint-1.26.2 → sarj_python_lint-1.26.3}/src/sarj_python_lint/rules/_suppression_comments.py

@@ -1,11 +1,18 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
+from functools import lru_cache
 import tokenize
+from types import MappingProxyType
+from typing import TYPE_CHECKING
 
 from sarj_python_lint.rules._comments import all_comments
 
 
+if TYPE_CHECKING:
+    from collections.abc import Mapping
+
+
 @dataclass(frozen=True, slots=True)
 class Comment:
     line: int
@@ -34,3 +41,10 @@ def scan_comments_or_none(source: str) -> list[Comment] | None:
         return scan_comments(source)
     except tokenize.TokenError, SyntaxError:
         return None
+
+
+@lru_cache(maxsize=1)
+def comment_lines(source_lines: tuple[str, ...]) -> Mapping[int, str]:
+    return MappingProxyType(
+        {comment.line: "# " + comment.body for comment in scan_comments_or_none("\n".join(source_lines)) or ()}
+    )