X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/3eea3aad864b83af3b6c477c32f15eb821fe9341..e5f5d54a224254bb7227f0379d0af0dde81aff37:/tests/expression.diff diff --git a/tests/expression.diff b/tests/expression.diff index 835b7b0..8b73f32 100644 --- a/tests/expression.diff +++ b/tests/expression.diff @@ -1,5 +1,5 @@ ---- (original) -+++ (formatted) +--- [Deterministic header] ++++ [Deterministic header] @@ -1,8 +1,8 @@ ... -'some_string' @@ -11,7 +11,7 @@ True False 1 -@@ -29,62 +29,82 @@ +@@ -29,62 +29,83 @@ ~great +value -1 @@ -29,7 +29,8 @@ manylambdas = lambda x=lambda y=lambda z=1: z: y(): x() -foo = (lambda port_id, ignore_missing: {"port1": port1_resource, "port2": port2_resource}[port_id]) +foo = lambda port_id, ignore_missing: { -+ "port1": port1_resource, "port2": port2_resource ++ "port1": port1_resource, ++ "port2": port2_resource, +}[port_id] 1 if True else 2 str or None if True else str or bytes or None @@ -115,7 +116,7 @@ call(**self.screen_kwargs) call(b, **self.screen_kwargs) lukasz.langa.pl -@@ -93,11 +113,11 @@ +@@ -93,23 +114,25 @@ 1.0 .real ....__class__ list[str] @@ -126,9 +127,27 @@ very_long_variable_name_filters: t.List[ t.Tuple[str, t.Union[str, t.List[t.Optional[str]]]], ] + xxxx_xxxxx_xxxx_xxx: Callable[..., List[SomeClass]] = classmethod( # type: ignore + sync(async_xxxx_xxx_xxxx_xxxxx_xxxx_xxx.__func__) + ) +-xxxx_xxx_xxxx_xxxxx_xxxx_xxx: Callable[..., List[SomeClass]] = classmethod( # type: ignore +- sync(async_xxxx_xxx_xxxx_xxxxx_xxxx_xxx.__func__) +-) + xxxx_xxx_xxxx_xxxxx_xxxx_xxx: Callable[ + ..., List[SomeClass] +-] = classmethod(sync(async_xxxx_xxx_xxxx_xxxxx_xxxx_xxx.__func__)) # type: ignore ++] = classmethod( # type: ignore ++ sync(async_xxxx_xxx_xxxx_xxxxx_xxxx_xxx.__func__) ++) ++xxxx_xxx_xxxx_xxxxx_xxxx_xxx: Callable[..., List[SomeClass]] = classmethod( ++ sync(async_xxxx_xxx_xxxx_xxxxx_xxxx_xxx.__func__) ++) # type: ignore slice[0] slice[0:1] -@@ -124,103 +144,138 @@ + slice[0:1:2] + slice[:] + slice[:-1] +@@ -133,109 +156,161 @@ numpy[-(c + 1) :, d] numpy[:, l[-2]] numpy[:, ::-1] @@ -164,18 +183,25 @@ c = 1 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 ++) ++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() +) -+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() Ø = set() authors.łukasz.say_thanks() mapping = { @@ -208,6 +234,10 @@ -for i in (call()): ... -for j in (1 + (2 + 3)): ... -while(this and that): ... +-a = aaaa.bbbb.cccc.dddd.eeee.ffff.gggg.hhhh.iiii.jjjj.kkkk.llll.mmmm.nnnn.oooo.pppp in qqqq.rrrr.ssss.tttt.uuuu.vvvv.xxxx.yyyy.zzzz +-a = aaaa.bbbb.cccc.dddd.eeee.ffff.gggg.hhhh.iiii.jjjj.kkkk.llll.mmmm.nnnn.oooo.pppp not in qqqq.rrrr.ssss.tttt.uuuu.vvvv.xxxx.yyyy.zzzz +-a = aaaa.bbbb.cccc.dddd.eeee.ffff.gggg.hhhh.iiii.jjjj.kkkk.llll.mmmm.nnnn.oooo.pppp is qqqq.rrrr.ssss.tttt.uuuu.vvvv.xxxx.yyyy.zzzz +-a = aaaa.bbbb.cccc.dddd.eeee.ffff.gggg.hhhh.iiii.jjjj.kkkk.llll.mmmm.nnnn.oooo.pppp is not qqqq.rrrr.ssss.tttt.uuuu.vvvv.xxxx.yyyy.zzzz -if ( - threading.current_thread() != threading.main_thread() and - threading.current_thread() != threading.main_thread() or @@ -256,8 +286,8 @@ - ~ aaaaaaaaaaaaaaaa.a + aaaaaaaaaaaaaaaa.b - aaaaaaaaaaaaaaaa.c * aaaaaaaaaaaaaaaa.d @ aaaaaaaaaaaaaaaa.e | aaaaaaaaaaaaaaaa.f & aaaaaaaaaaaaaaaa.g % aaaaaaaaaaaaaaaa.h ^ aaaaaaaaaaaaaaaa.i << aaaaaaaaaaaaaaaa.k >> aaaaaaaaaaaaaaaa.l ** aaaaaaaaaaaaaaaa.m // aaaaaaaaaaaaaaaa.n +print(*lambda x: x) +assert not Test, "Short message" -+assert ( -+ this is ComplexTest and not requirements.fit_in_a_single_line(force=False) ++assert this is ComplexTest and not requirements.fit_in_a_single_line( ++ force=False +), "Short message" +assert parens is TooMany +for (x,) in (1,), (2,), (3,): @@ -272,6 +302,22 @@ + ... +while this and that: + ... ++a = ( ++ aaaa.bbbb.cccc.dddd.eeee.ffff.gggg.hhhh.iiii.jjjj.kkkk.llll.mmmm.nnnn.oooo.pppp ++ in qqqq.rrrr.ssss.tttt.uuuu.vvvv.xxxx.yyyy.zzzz ++) ++a = ( ++ aaaa.bbbb.cccc.dddd.eeee.ffff.gggg.hhhh.iiii.jjjj.kkkk.llll.mmmm.nnnn.oooo.pppp ++ not in qqqq.rrrr.ssss.tttt.uuuu.vvvv.xxxx.yyyy.zzzz ++) ++a = ( ++ aaaa.bbbb.cccc.dddd.eeee.ffff.gggg.hhhh.iiii.jjjj.kkkk.llll.mmmm.nnnn.oooo.pppp ++ is qqqq.rrrr.ssss.tttt.uuuu.vvvv.xxxx.yyyy.zzzz ++) ++a = ( ++ aaaa.bbbb.cccc.dddd.eeee.ffff.gggg.hhhh.iiii.jjjj.kkkk.llll.mmmm.nnnn.oooo.pppp ++ is not qqqq.rrrr.ssss.tttt.uuuu.vvvv.xxxx.yyyy.zzzz ++) +if ( + threading.current_thread() != threading.main_thread() + and threading.current_thread() != threading.main_thread()