Fix placement of dictionary unpacking inside dict literals

Fixes #111

diff --git a/README.md b/README.md
index d41da0cf49bcd8bed68b788bb8bf352fd7e75671..c68f703f7e45203b559965e2d6c335b3f96aa430 100644 (file)
--- a/README.md
+++ b/README.md
@@ -495,6 +495,8 @@ More details can be found in [CONTRIBUTING](CONTRIBUTING.md).
 
 * fixed parsing of unaligned standalone comments (#99, #112)
 
 
 * fixed parsing of unaligned standalone comments (#99, #112)
 

+* fixed placement of dictionary unpacking inside dictionary literals (#111)
+

 ### 18.4a1
 
 * added `--quiet` (#78)
 ### 18.4a1
 
 * added `--quiet` (#78)

diff --git a/black.py b/black.py
index c1e83f7f531622b9faa0d3c6b71228a4d1c176e9..537ba599807ffea932a223884a40488d22c8ab45 100644 (file)
--- a/black.py
+++ b/black.py
@@ -1498,7 +1498,7 @@ def is_split_before_delimiter(leaf: Leaf, previous: Leaf = None) -> int:
     if (
         leaf.type in VARARGS
         and leaf.parent
     if (
         leaf.type in VARARGS
         and leaf.parent

-        and leaf.parent.type in {syms.argument, syms.typedargslist}
+        and leaf.parent.type in {syms.argument, syms.typedargslist, syms.dictsetmaker}

     ):
         # * and ** might also be MATH_OPERATORS but in this case they are not.
         # Don't treat them as a delimiter.
     ):
         # * and ** might also be MATH_OPERATORS but in this case they are not.
         # Don't treat them as a delimiter.

diff --git a/tests/expression.diff b/tests/expression.diff
index 965aa00e7fac3de4402b456c85151d95de3b397d..02bdc2ced3076c26d58ab48fd586f593b7b80962 100644 (file)
--- a/tests/expression.diff
+++ b/tests/expression.diff
@@ -103,7 +103,7 @@
  ]
  slice[0]
  slice[0:1]
  ]
  slice[0]
  slice[0:1]

-@@ -114,78 +123,104 @@
+@@ -114,79 +123,113 @@

  numpy[-(c + 1):, d]
  numpy[:, l[-2]]
  numpy[:, ::-1]
  numpy[-(c + 1):, d]
  numpy[:, l[-2]]
  numpy[:, ::-1]


@@ -123,6 +123,16 @@
 +((i ** 2) for i, _ in ((1, "a"), (2, "b"), (3, "c")))
  (((i ** 2) + j) for i in (1, 2, 3) for j in (1, 2, 3))
  (*starred)
 +((i ** 2) for i, _ in ((1, "a"), (2, "b"), (3, "c")))
  (((i ** 2) + j) for i in (1, 2, 3) for j in (1, 2, 3))
  (*starred)

+-{"id": "1","type": "type","started_at": now(),"ended_at": now() + timedelta(days=10),"priority": 1,"import_session_id": 1,**kwargs}  # no trailing comma, this file is not 3.6+
++{
++    "id": "1",
++    "type": "type",
++    "started_at": now(),
++    "ended_at": now() + timedelta(days=10),
++    "priority": 1,
++    "import_session_id": 1,
++    **kwargs
++}  # no trailing comma, this file is not 3.6+

  a = (1,)
  b = 1,
  c = 1
  a = (1,)
  b = 1,
  c = 1

diff --git a/tests/expression.py b/tests/expression.py
index b03abfa0e1b77e229c7cc308c24d803627e49911..357cbb63d248cf4497ab3c2527f950a9d1e75bf7 100644 (file)
--- a/tests/expression.py
+++ b/tests/expression.py
@@ -127,6 +127,7 @@ SomeName
 ((i ** 2) for i, _ in ((1, 'a'), (2, 'b'), (3, 'c')))
 (((i ** 2) + j) for i in (1, 2, 3) for j in (1, 2, 3))
 (*starred)
 ((i ** 2) for i, _ in ((1, 'a'), (2, 'b'), (3, 'c')))
 (((i ** 2) + j) for i in (1, 2, 3) for j in (1, 2, 3))
 (*starred)

+{"id": "1","type": "type","started_at": now(),"ended_at": now() + timedelta(days=10),"priority": 1,"import_session_id": 1,**kwargs}  # no trailing comma, this file is not 3.6+

 a = (1,)
 b = 1,
 c = 1
 a = (1,)
 b = 1,
 c = 1


@@ -331,6 +332,15 @@ SomeName
 ((i ** 2) for i, _ in ((1, "a"), (2, "b"), (3, "c")))
 (((i ** 2) + j) for i in (1, 2, 3) for j in (1, 2, 3))
 (*starred)
 ((i ** 2) for i, _ in ((1, "a"), (2, "b"), (3, "c")))
 (((i ** 2) + j) for i in (1, 2, 3) for j in (1, 2, 3))
 (*starred)

+{
+    "id": "1",
+    "type": "type",
+    "started_at": now(),
+    "ended_at": now() + timedelta(days=10),
+    "priority": 1,
+    "import_session_id": 1,
+    **kwargs
+}  # no trailing comma, this file is not 3.6+

 a = (1,)
 b = 1,
 c = 1
 a = (1,)
 b = 1,
 c = 1