prettycsharp 1.1.5__tar.gz → 1.1.7__tar.gz

{prettycsharp-1.1.5 → prettycsharp-1.1.7}/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 Each release's section becomes the body of its GitHub release.
 
+## [1.1.7] - 2026-10-18
+
+- Comments after the final `switch` section align with its statements
+  instead of its case label, avoiding Visual Studio's IDE0055 formatting
+  diagnostic. Switches containing only comments keep one indentation level.
+
+## [1.1.6] - 2026-10-18
+
+- `for` headers keep a space between semicolons when the condition is
+  omitted, such as `for (var start = 0; ;)`, avoiding Visual Studio's
+  IDE0055 formatting diagnostic. Fully empty headers print `for (; ; )`.
+
 ## [1.1.5] - 2026-10-18
 
 - Nullable array types print tight, `object?[]?`, instead of

{prettycsharp-1.1.5 → prettycsharp-1.1.7}/DESIGN.md

@@ -161,6 +161,10 @@ public void Ship()
 
 ### Line breaking
 
+`for` headers keep a space after each semicolon even when the next clause
+is omitted: `for (var i = 0; ;)`. There is no space before the closing
+parenthesis unless all three clauses are empty: `for (; ; )`.
+
 | Setting | Default | Alternatives |
 | --- | --- | --- |
 | `argument_wrap` | `one_per_line`: each argument on its own line, `)` on its own line. Also applies to parameter lists. | `one_per_line_close_on_last`, `fill`, `align` |
@@ -269,6 +273,9 @@ public enum Status
 | `switch_case_indent` | `true` | `false` |
 | `switch_case_blank_lines` | `true`: blank line between case sections; stacked fall-through labels stay together | `false` |
 
+Comments after the final switch section align with its statements. A switch
+containing only comments indents them one level inside its braces.
+
 ### Syntax rewrites
 
 These change tokens, not only whitespace. Verification accounts for each one.

{prettycsharp-1.1.5 → prettycsharp-1.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: prettycsharp
-Version: 1.1.5
+Version: 1.1.7
 Summary: An opinionated formatter for C#, in the spirit of Prettier
 Project-URL: Homepage, https://github.com/WilliamSmithEdward/prettyCSharp
 Project-URL: Repository, https://github.com/WilliamSmithEdward/prettyCSharp

{prettycsharp-1.1.5 → prettycsharp-1.1.7}/src/prettycsharp/__init__.py

@@ -4,7 +4,7 @@ from prettycsharp.formatter import FormatResult, FormattingError, format_details
 from prettycsharp.parsing import CSharpSyntaxError
 from prettycsharp.settings import Settings, SettingsError
 
-__version__ = "1.1.5"
+__version__ = "1.1.7"
 
 __all__ = [
     "CSharpSyntaxError",

{prettycsharp-1.1.5 → prettycsharp-1.1.7}/src/prettycsharp/printer/statements.py

@@ -227,18 +227,25 @@ class Statements(Expressions):
         close_tok = node.children[close_index]
         body = node.children[close_index + 1] if close_index + 1 < len(node.children) else None
         open_index = node.children.index(open_tok)
+        header_children = node.children[open_index + 1 : close_index]
+        empty = not any(child.named for child in header_children)
         inner: list[Doc] = []
         pending_space = False
-        for child in node.children[open_index + 1 : close_index]:
+        for child in header_children:
+            if pending_space:
+                inner.append(LINE)
             if child.text in (";", ",") and not child.named:
                 inner.append(self.tok(child))
                 pending_space = True
                 continue
-            if pending_space:
-                inner.append(LINE)
             pending_space = False
             inner.append(self.print(child))
-        header = group([self.tok(keyword), " ", self.tok(open_tok), indent([SOFTLINE, inner]), SOFTLINE, self.tok(close_tok)])
+        header = group(
+            [
+                self.tok(keyword), " ", self.tok(open_tok), indent([SOFTLINE, inner]),
+                LINE if empty else SOFTLINE, self.tok(close_tok),
+            ]
+        )
         if body is None:
             return header
         return [header, self.embedded(body, close_tok, node)]
@@ -320,7 +327,11 @@ class Statements(Expressions):
             lines = [HARDLINE, self.print_list(sections, self.section_blank)]
             # Case labels sit one level in, or flush with switch.
             body = indent(lines) if self.settings.switch_case_indent else lines
-        return [self.tok(open_tok), body, self.close_comments(close_tok), HARDLINE, self.tok(close_tok, leading=False)]
+        comments = self.close_comments(close_tok)
+        # Trailing comments belong at the final section's statement level.
+        if self.settings.switch_case_indent and any(section.type == "switch_section" for section in sections):
+            comments = indent(comments)
+        return [self.tok(open_tok), body, comments, HARDLINE, self.tok(close_tok, leading=False)]
 
     def section_blank(self, previous: Node, item: Node) -> bool:
         if self.tight_directive(previous, item):

{prettycsharp-1.1.5 → prettycsharp-1.1.7}/tests/test_layout.py

@@ -1,8 +1,30 @@
 """The default layout, one DESIGN.md decision per test."""
 
+import pytest
+
 from support import check, fmt
 
 
+@pytest.mark.parametrize(
+    ("source", "expected"),
+    [
+        (";;", "; ; "),
+        ("int i=0;;", "int i = 0; ;"),
+        (";i<10;", "; i < 10;"),
+        (";;i++", "; ; i++"),
+        ("int i=0;i<10;", "int i = 0; i < 10;"),
+        ("int i=0;;i++", "int i = 0; ; i++"),
+        (";i<10;i++", "; i < 10; i++"),
+        ("int i=0;i<10;i++", "int i = 0; i < 10; i++"),
+        ("int i=0,j=1;;i++,j--", "int i = 0, j = 1; ; i++, j--"),
+        ("var start=query[0]=='?'?1:0;;", "var start = query[0] == '?' ? 1 : 0; ;"),
+        ("int i=0;/* condition omitted */;", "int i = 0; /* condition omitted */ ;"),
+    ],
+)
+def test_for_header_spacing_with_omitted_clauses(source: str, expected: str) -> None:
+    check(f"for({source}){{break;}}", f"for ({expected})\n{{\n    break;\n}}\n")
+
+
 def test_allman_braces_with_blank_line_before_continuations() -> None:
     check(
         """
@@ -539,6 +561,29 @@ def test_nothing_is_padded_into_columns() -> None:
     )
 
 
+@pytest.mark.parametrize("case_indent", [True, False])
+@pytest.mark.parametrize("comment", ["// Unknown settings are ignored.", "/* Unknown settings are ignored. */"])
+@pytest.mark.parametrize("blank", ["", "\n"])
+def test_trailing_switch_comment_aligns_with_statements(case_indent: bool, comment: str, blank: str) -> None:
+    label_indent = "    " if case_indent else ""
+    statement_indent = label_indent + "    "
+    check(
+        f"switch(x){{case 9:break;\n{blank}{comment}\n}}",
+        f"switch (x)\n{{\n{label_indent}case 9:\n{statement_indent}break;\n"
+        f"{blank}{statement_indent}{comment}\n}}\n",
+        switch_case_indent=case_indent,
+    )
+
+
+@pytest.mark.parametrize("case_indent", [True, False])
+def test_comment_only_switch_keeps_one_indent(case_indent: bool) -> None:
+    check(
+        "switch(x){\n// No cases yet.\n}",
+        "switch (x)\n{\n    // No cases yet.\n}\n",
+        switch_case_indent=case_indent,
+    )
+
+
 def test_switch_expression_arms_align_when_turned_on() -> None:
     check(
         """