@@ -625,7 +625,8 @@ def trailing_comma?
625
625
# If the last argument is a block, then we can't put a trailing comma
626
626
# after it without resulting in a syntax error.
627
627
false
628
- elsif parts . length == 1 && ( part = parts . first ) && ( part . is_a? ( Command ) || part . is_a? ( CommandCall ) )
628
+ elsif parts . length == 1 && ( part = parts . first ) &&
629
+ ( part . is_a? ( Command ) || part . is_a? ( CommandCall ) )
629
630
# If the only argument is a command or command call, then a trailing
630
631
# comma would be parsed as part of that expression instead of on this
631
632
# one, so we don't want to add a trailing comma.
@@ -1444,7 +1445,8 @@ def format_key(q, key)
1444
1445
when DynaSymbol
1445
1446
parts = key . parts
1446
1447
1447
- if parts . length == 1 && ( part = parts . first ) && part . is_a? ( TStringContent ) && part . value . match? ( LABEL )
1448
+ if parts . length == 1 && ( part = parts . first ) &&
1449
+ part . is_a? ( TStringContent ) && part . value . match? ( LABEL )
1448
1450
q . format ( part )
1449
1451
q . text ( ":" )
1450
1452
else
@@ -2054,7 +2056,8 @@ def forced_brace_bounds?(q)
2054
2056
when Paren , Statements
2055
2057
# If we hit certain breakpoints then we know we're safe.
2056
2058
return false
2057
- when If , IfMod , IfOp , Unless , UnlessMod , While , WhileMod , Until , UntilMod
2059
+ when If , IfMod , IfOp , Unless , UnlessMod , While , WhileMod , Until ,
2060
+ UntilMod
2058
2061
return true if parent . predicate == previous
2059
2062
previous = parent
2060
2063
end
@@ -2395,11 +2398,7 @@ def format(q)
2395
2398
when :"::"
2396
2399
q . text ( "." )
2397
2400
when Op
2398
- if operator . value == "::"
2399
- q . text ( "." )
2400
- else
2401
- operator . format ( q )
2402
- end
2401
+ operator . value == "::" ? q . text ( "." ) : operator . format ( q )
2403
2402
else
2404
2403
operator . format ( q )
2405
2404
end
@@ -2465,7 +2464,8 @@ def format(q)
2465
2464
# nodes.
2466
2465
parent = parents [ 3 ] if parent . is_a? ( DoBlock )
2467
2466
2468
- if parent . is_a? ( MethodAddBlock ) && parent . call . is_a? ( FCall ) && parent . call . value . value == "sig"
2467
+ if parent . is_a? ( MethodAddBlock ) && parent . call . is_a? ( FCall ) &&
2468
+ parent . call . value . value == "sig"
2469
2469
threshold = 2
2470
2470
end
2471
2471
end
@@ -2510,7 +2510,10 @@ def format_chain(q, children)
2510
2510
2511
2511
while ( child = children . pop )
2512
2512
if child . is_a? ( Call )
2513
- if child . receiver . is_a? ( Call ) && ( child . receiver . message != :call ) && ( child . receiver . message . value == "where" ) && ( child . message . value == "not" )
2513
+ if child . receiver . is_a? ( Call ) &&
2514
+ ( child . receiver . message != :call ) &&
2515
+ ( child . receiver . message . value == "where" ) &&
2516
+ ( child . message . value == "not" )
2514
2517
# This is very specialized behavior wherein we group
2515
2518
# .where.not calls together because it looks better. For more
2516
2519
# information, see
@@ -2684,7 +2687,8 @@ def format(q)
2684
2687
# If we're at the top of a call chain, then we're going to do some
2685
2688
# specialized printing in case we can print it nicely. We _only_ do this
2686
2689
# at the top of the chain to avoid weird recursion issues.
2687
- if CallChainFormatter . chained? ( receiver ) && !CallChainFormatter . chained? ( q . parent )
2690
+ if CallChainFormatter . chained? ( receiver ) &&
2691
+ !CallChainFormatter . chained? ( q . parent )
2688
2692
q . group do
2689
2693
q
2690
2694
. if_break { CallChainFormatter . new ( self ) . format ( q ) }
@@ -5344,7 +5348,8 @@ def call(q, node)
5344
5348
# wanted it to be an explicit conditional because there are parentheses
5345
5349
# around it. So we'll just leave it in place.
5346
5350
grandparent = q . grandparent
5347
- if grandparent . is_a? ( Paren ) && ( body = grandparent . contents . body ) && body . length == 1 && body . first == node
5351
+ if grandparent . is_a? ( Paren ) && ( body = grandparent . contents . body ) &&
5352
+ body . length == 1 && body . first == node
5348
5353
return false
5349
5354
end
5350
5355
@@ -5375,10 +5380,10 @@ def call(q, node)
5375
5380
# and default instead to breaking them into multiple lines.
5376
5381
def ternaryable? ( statement )
5377
5382
case statement
5378
- when Alias , Assign , Break , Command , CommandCall , Heredoc , If , IfMod , IfOp ,
5379
- Lambda , MAssign , Next , OpAssign , RescueMod , Return , Return0 , Super ,
5380
- Undef , Unless , UnlessMod , Until , UntilMod , VarAlias , VoidStmt , While ,
5381
- WhileMod , Yield , Yield0 , ZSuper
5383
+ when Alias , Assign , Break , Command , CommandCall , Heredoc , If , IfMod ,
5384
+ IfOp , Lambda , MAssign , Next , OpAssign , RescueMod , Return , Return0 ,
5385
+ Super , Undef , Unless , UnlessMod , Until , UntilMod , VarAlias ,
5386
+ VoidStmt , While , WhileMod , Yield , Yield0 , ZSuper
5382
5387
# This is a list of nodes that should not be allowed to be a part of a
5383
5388
# ternary clause.
5384
5389
false
@@ -6470,7 +6475,8 @@ def format(q)
6470
6475
# If we're at the top of a call chain, then we're going to do some
6471
6476
# specialized printing in case we can print it nicely. We _only_ do this
6472
6477
# at the top of the chain to avoid weird recursion issues.
6473
- if CallChainFormatter . chained? ( call ) && !CallChainFormatter . chained? ( q . parent )
6478
+ if CallChainFormatter . chained? ( call ) &&
6479
+ !CallChainFormatter . chained? ( q . parent )
6474
6480
q . group do
6475
6481
q
6476
6482
. if_break { CallChainFormatter . new ( self ) . format ( q ) }
@@ -7330,9 +7336,10 @@ def format(q)
7330
7336
q . group do
7331
7337
q . indent do
7332
7338
q . breakable_empty
7333
- q . seplist ( elements , ArrayLiteral ::BREAKABLE_SPACE_SEPARATOR ) do |element |
7334
- q . format ( element )
7335
- end
7339
+ q . seplist (
7340
+ elements ,
7341
+ ArrayLiteral ::BREAKABLE_SPACE_SEPARATOR
7342
+ ) { |element | q . format ( element ) }
7336
7343
end
7337
7344
q . breakable_empty
7338
7345
end
@@ -7423,9 +7430,10 @@ def format(q)
7423
7430
q . group do
7424
7431
q . indent do
7425
7432
q . breakable_empty
7426
- q . seplist ( elements , ArrayLiteral ::BREAKABLE_SPACE_SEPARATOR ) do |element |
7427
- q . format ( element )
7428
- end
7433
+ q . seplist (
7434
+ elements ,
7435
+ ArrayLiteral ::BREAKABLE_SPACE_SEPARATOR
7436
+ ) { |element | q . format ( element ) }
7429
7437
end
7430
7438
q . breakable_empty
7431
7439
end
@@ -8378,7 +8386,7 @@ def format(q)
8378
8386
q . text ( "; " )
8379
8387
q . format ( statement )
8380
8388
end
8381
-
8389
+
8382
8390
line = statement . location . end_line
8383
8391
previous = statement
8384
8392
end
@@ -8890,9 +8898,10 @@ def format(q)
8890
8898
q . group do
8891
8899
q . indent do
8892
8900
q . breakable_empty
8893
- q . seplist ( elements , ArrayLiteral ::BREAKABLE_SPACE_SEPARATOR ) do |element |
8894
- q . format ( element )
8895
- end
8901
+ q . seplist (
8902
+ elements ,
8903
+ ArrayLiteral ::BREAKABLE_SPACE_SEPARATOR
8904
+ ) { |element | q . format ( element ) }
8896
8905
end
8897
8906
q . breakable_empty
8898
8907
end
@@ -9773,15 +9782,17 @@ def format(q)
9773
9782
def pin ( parent )
9774
9783
replace = PinnedVarRef . new ( value : value , location : location )
9775
9784
9776
- parent . deconstruct_keys ( [ ] ) . each do |key , value |
9777
- if value == self
9778
- parent . instance_variable_set ( :"@#{ key } " , replace )
9779
- break
9780
- elsif value . is_a? ( Array ) && ( index = value . index ( self ) )
9781
- parent . public_send ( key ) [ index ] = replace
9782
- break
9785
+ parent
9786
+ . deconstruct_keys ( [ ] )
9787
+ . each do |key , value |
9788
+ if value == self
9789
+ parent . instance_variable_set ( :"@#{ key } " , replace )
9790
+ break
9791
+ elsif value . is_a? ( Array ) && ( index = value . index ( self ) )
9792
+ parent . public_send ( key ) [ index ] = replace
9793
+ break
9794
+ end
9783
9795
end
9784
- end
9785
9796
end
9786
9797
end
9787
9798
@@ -10229,9 +10240,10 @@ def format(q)
10229
10240
q . group do
10230
10241
q . indent do
10231
10242
q . breakable_empty
10232
- q . seplist ( elements , ArrayLiteral ::BREAKABLE_SPACE_SEPARATOR ) do |element |
10233
- q . format ( element )
10234
- end
10243
+ q . seplist (
10244
+ elements ,
10245
+ ArrayLiteral ::BREAKABLE_SPACE_SEPARATOR
10246
+ ) { |element | q . format ( element ) }
10235
10247
end
10236
10248
q . breakable_empty
10237
10249
end
0 commit comments