Ensure match/case are recognized as statements (#2665)

diff --git a/CHANGES.md b/CHANGES.md
index 590429141740e6d019da698bb2e6b4bba217a338..c9a4f09a72a8b88b1439223ca9e085d81dc50315 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,7 @@
   `match a, *b:` (#2639) (#2659)
 - Fix `match`/`case` statements that contain `match`/`case` soft keywords multiple
   times, like `match re.match()` (#2661)
   `match a, *b:` (#2639) (#2659)
 - Fix `match`/`case` statements that contain `match`/`case` soft keywords multiple
   times, like `match re.match()` (#2661)

+- Fix `case` statements with an inline body (#2665)

 - Fix assignment to environment variables in Jupyter Notebooks (#2642)
 - Add `flake8-simplify` and `flake8-comprehensions` plugins (#2653)
 - Fix determination of f-string expression spans (#2654)
 - Fix assignment to environment variables in Jupyter Notebooks (#2642)
 - Add `flake8-simplify` and `flake8-comprehensions` plugins (#2653)
 - Fix determination of f-string expression spans (#2654)

diff --git a/src/black/nodes.py b/src/black/nodes.py
index 36dd18905114506ec0cac5c920dea482b02899b0..437051d3f6d5634910af587d2d4eec3cce574f8e 100644 (file)
--- a/src/black/nodes.py
+++ b/src/black/nodes.py
@@ -52,6 +52,8 @@ STATEMENT: Final = {
     syms.with_stmt,
     syms.funcdef,
     syms.classdef,
     syms.with_stmt,
     syms.funcdef,
     syms.classdef,

+    syms.match_stmt,
+    syms.case_block,

 }
 STANDALONE_COMMENT: Final = 153
 token.tok_name[STANDALONE_COMMENT] = "STANDALONE_COMMENT"
 }
 STANDALONE_COMMENT: Final = 153
 token.tok_name[STANDALONE_COMMENT] = "STANDALONE_COMMENT"

diff --git a/tests/data/pattern_matching_style.py b/tests/data/pattern_matching_style.py
new file mode 100644 (file)
index 0000000..c1c0aee
--- /dev/null
+++ b/tests/data/pattern_matching_style.py
@@ -0,0 +1,27 @@
+match something:
+    case b(): print(1+1)
+    case c(
+        very_complex=True,
+        perhaps_even_loooooooooooooooooooooooooooooooooooooong=-   1
+    ): print(1)
+    case c(
+        very_complex=True,
+        perhaps_even_loooooooooooooooooooooooooooooooooooooong=-1
+    ): print(2)
+    case a: pass
+
+# output
+
+match something:
+    case b():
+        print(1 + 1)
+    case c(
+        very_complex=True, perhaps_even_loooooooooooooooooooooooooooooooooooooong=-1
+    ):
+        print(1)
+    case c(
+        very_complex=True, perhaps_even_loooooooooooooooooooooooooooooooooooooong=-1
+    ):
+        print(2)
+    case a:
+        pass

diff --git a/tests/test_format.py b/tests/test_format.py
index f97d7165b1af353278200aa6610e4782a5df35be..d44be1e8712ba6fa6a116f9c066f0493779cbffa 100644 (file)
--- a/tests/test_format.py
+++ b/tests/test_format.py
@@ -74,6 +74,7 @@ PY310_CASES = [
     "pattern_matching_simple",
     "pattern_matching_complex",
     "pattern_matching_extras",
     "pattern_matching_simple",
     "pattern_matching_complex",
     "pattern_matching_extras",

+    "pattern_matching_style",

     "parenthesized_context_managers",
 ]
 
     "parenthesized_context_managers",
 ]