Parse complex expressions in parameters after * and **

[etc/vim.git] / tests / expression.diff

diff --git a/tests/expression.diff b/tests/expression.diff
index 02bdc2ced3076c26d58ab48fd586f593b7b80962..dd9459c4453593e8ab186ba2c51c6720740d6888 100644 (file)
--- a/tests/expression.diff
+++ b/tests/expression.diff
@@ -11,7 +11,7 @@
  True
  False
  1
  True
  False
  1

-@@ -29,65 +29,74 @@
+@@ -29,59 +29,73 @@

  ~great
  +value
  -1
  ~great
  +value
  -1


@@ -48,6 +48,19 @@
  [1, 2, 3, 4, 5, 6, 7, 8, 9, (10 or A), (11 or B), (12 or C)]
 -[1, 2, 3,]
 +[1, 2, 3]
  [1, 2, 3, 4, 5, 6, 7, 8, 9, (10 or A), (11 or B), (12 or C)]
 -[1, 2, 3,]
 +[1, 2, 3]

+ [*a]
+ [*range(10)]
+-[*a, 4, 5,]
+-[4, *a, 5,]
+-[this_is_a_very_long_variable_which_will_force_a_delimiter_split, element, another, *more]
++[*a, 4, 5]
++[4, *a, 5]
++[
++    this_is_a_very_long_variable_which_will_force_a_delimiter_split,
++    element,
++    another,
++    *more,
++]

  {i for i in (1, 2, 3)}
  {(i ** 2) for i in (1, 2, 3)}
 -{(i ** 2) for i, _ in ((1, 'a'), (2, 'b'), (3, 'c'))}
  {i for i in (1, 2, 3)}
  {(i ** 2) for i in (1, 2, 3)}
 -{(i ** 2) for i, _ in ((1, 'a'), (2, 'b'), (3, 'c'))}


@@ -87,10 +100,11 @@
 +    **kwargs
 +)  # note: no trailing comma pre-3.6
  call(*gidgets[:2])
 +    **kwargs
 +)  # note: no trailing comma pre-3.6
  call(*gidgets[:2])

+ call(a, *gidgets[:2])

  call(**self.screen_kwargs)
  call(**self.screen_kwargs)

+ call(b, **self.screen_kwargs)

  lukasz.langa.pl
  lukasz.langa.pl

- call.me(maybe)
- 1 .real
+@@ -90,11 +104,11 @@

  1.0 .real
  ....__class__
  list[str]
  1.0 .real
  ....__class__
  list[str]


@@ -103,7 +117,7 @@
  ]
  slice[0]
  slice[0:1]
  ]
  slice[0]
  slice[0:1]

-@@ -114,79 +123,113 @@
+@@ -121,88 +135,122 @@

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


@@ -123,7 +137,7 @@
 +((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}

 +{
 +    "id": "1",
 +    "type": "type",
 +{
 +    "id": "1",
 +    "type": "type",


@@ -131,8 +145,8 @@
 +    "ended_at": now() + timedelta(days=10),
 +    "priority": 1,
 +    "import_session_id": 1,
 +    "ended_at": now() + timedelta(days=10),
 +    "priority": 1,
 +    "import_session_id": 1,

-+    **kwargs
-+}  # no trailing comma, this file is not 3.6+
++    **kwargs,
++}

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


@@ -154,6 +168,12 @@
 +).all()
  Ø = set()
  authors.łukasz.say_thanks()
 +).all()
  Ø = set()
  authors.łukasz.say_thanks()

+ mapping = {
+     A: 0.25 * (10.0 / 12),
+     B: 0.1 * (10.0 / 12),
+     C: 0.1 * (10.0 / 12),
+     D: 0.1 * (10.0 / 12),
+ }

  
 +
  def gen():
  
 +
  def gen():


@@ -164,6 +184,12 @@
  
  async def f():
      await some.complicated[0].call(with_args=(True or (1 is not 1)))
  
  async def f():
      await some.complicated[0].call(with_args=(True or (1 is not 1)))

+-print(* [] or [1])
++
++
++print(*[] or [1])
+ print(**{1: 3} if False else {x: x for x in range(3)})
+-print(* lambda x: x)

 -for x, in (1,), (2,), (3,): ...
 -for y in (): ...
 -for z in (i for i in (1, 2, 3)): ...
 -for x, in (1,), (2,), (3,): ...
 -for y in (): ...
 -for z in (i for i in (1, 2, 3)): ...


@@ -206,8 +232,7 @@
 -    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 -):
 -    return True
 -    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 -):
 -    return True

-+
-+
++print(*lambda x: x)

 +for (x,) in (1,), (2,), (3,):
 +    ...
 +for y in ():
 +for (x,) in (1,), (2,), (3,):
 +    ...
 +for y in ():