Don't put a space after `*` in `g = 1, *"x"` (#309)

Fixes #305.

diff --git a/black.py b/black.py
index d048162e3629cdabfc99a7d6ab60c1fe70a37b75..e72db2b1e0650b95a68c3659fd351e461b677578 100644 (file)
--- a/black.py
+++ b/black.py
@@ -1835,7 +1835,7 @@ def whitespace(leaf: Leaf, *, complex_subscript: bool) -> str:  # noqa C901
             elif prevp.type == token.EQUAL and prevp_parent.type == syms.argument:
                 return NO
 
             elif prevp.type == token.EQUAL and prevp_parent.type == syms.argument:
                 return NO
 

-        elif t == token.NAME or t == token.NUMBER:
+        elif t in {token.NAME, token.NUMBER, token.STRING}:

             return NO
 
     elif p.type == syms.import_from:
             return NO
 
     elif p.type == syms.import_from:

diff --git a/tests/expression.diff b/tests/expression.diff
index 0d2ff68e4aa36bd6ce6606eca9f6c12f533f542a..8b73f321582783cf27520074e4c29a32592b9067 100644 (file)
--- a/tests/expression.diff
+++ b/tests/expression.diff
@@ -147,7 +147,7 @@
  slice[0:1:2]
  slice[:]
  slice[:-1]
  slice[0:1:2]
  slice[:]
  slice[:-1]

-@@ -133,108 +156,160 @@
+@@ -133,109 +156,161 @@

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


@@ -184,6 +184,7 @@
  d = (1,) + a + (2,)
  e = (1,).count(1)
  f = 1, *range(10)
  d = (1,) + a + (2,)
  e = (1,).count(1)
  f = 1, *range(10)

+ g = 1, *"ten"

 -what_is_up_with_those_new_coord_names = (coord_names + set(vars_to_create)) + set(vars_to_remove)
 -what_is_up_with_those_new_coord_names = (coord_names | set(vars_to_create)) - set(vars_to_remove)
 -result = session.query(models.Customer.id).filter(models.Customer.account_id == account_id, models.Customer.email == email_address).order_by(models.Customer.id.asc(),).all()
 -what_is_up_with_those_new_coord_names = (coord_names + set(vars_to_create)) + set(vars_to_remove)
 -what_is_up_with_those_new_coord_names = (coord_names | set(vars_to_create)) - set(vars_to_remove)
 -result = session.query(models.Customer.id).filter(models.Customer.account_id == account_id, models.Customer.email == email_address).order_by(models.Customer.id.asc(),).all()

diff --git a/tests/expression.py b/tests/expression.py
index ea927a59f402589949e3dfaa416e9b7db47fbf37..b1fa66bbf3295c59966aa281ddbbdadf54e38ee8 100644 (file)
--- a/tests/expression.py
+++ b/tests/expression.py
@@ -153,6 +153,7 @@ c = 1
 d = (1,) + a + (2,)
 e = (1,).count(1)
 f = 1, *range(10)
 d = (1,) + a + (2,)
 e = (1,).count(1)
 f = 1, *range(10)

+g = 1, *"ten"

 what_is_up_with_those_new_coord_names = (coord_names + set(vars_to_create)) + set(vars_to_remove)
 what_is_up_with_those_new_coord_names = (coord_names | set(vars_to_create)) - set(vars_to_remove)
 result = session.query(models.Customer.id).filter(models.Customer.account_id == account_id, models.Customer.email == email_address).order_by(models.Customer.id.asc(),).all()
 what_is_up_with_those_new_coord_names = (coord_names + set(vars_to_create)) + set(vars_to_remove)
 what_is_up_with_those_new_coord_names = (coord_names | set(vars_to_create)) - set(vars_to_remove)
 result = session.query(models.Customer.id).filter(models.Customer.account_id == account_id, models.Customer.email == email_address).order_by(models.Customer.id.asc(),).all()


@@ -428,6 +429,7 @@ c = 1
 d = (1,) + a + (2,)
 e = (1,).count(1)
 f = 1, *range(10)
 d = (1,) + a + (2,)
 e = (1,).count(1)
 f = 1, *range(10)

+g = 1, *"ten"

 what_is_up_with_those_new_coord_names = (coord_names + set(vars_to_create)) + set(
     vars_to_remove
 )
 what_is_up_with_those_new_coord_names = (coord_names + set(vars_to_create)) + set(
     vars_to_remove
 )