More formatting fixes

Author: kddnewton

bin/test

@@ -50,25 +50,16 @@ END {
 
 __END__
 aref_field.rb:4
-array_literal.rb:5
-array_literal.rb:7
-array_literal.rb:8
-array_literal.rb:10
-array_literal.rb:17
-array_literal.rb:19
 assign.rb:5
 assign.rb:6
 assoc.rb:1
-assoc.rb:7
 assoc.rb:8
-bare_assoc_hash.rb:1
-bare_assoc_hash.rb:2
-bare_assoc_hash.rb:3
 bare_assoc_hash.rb:4
 bodystmt.rb:6
 brace_block.rb:0
 brace_block.rb:1
 break.rb:8
+break.rb:9
 call.rb:7
 call.rb:8
 call.rb:9
@@ -77,13 +68,15 @@ call.rb:11
 call.rb:14
 call.rb:15
 call.rb:16
-command.rb:1
 command.rb:8
 command.rb:9
-command_call.rb:1
+command_call.rb:2
+command_call.rb:3
+command_call.rb:4
 command_call.rb:5
 command_call.rb:6
 command_call.rb:7
+command_call.rb:8
 command_call.rb:9
 command_call.rb:10
 command_call.rb:11
@@ -101,7 +94,6 @@ do_block.rb:3
 do_block.rb:4
 dyna_symbol.rb:0
 dyna_symbol.rb:4
-dyna_symbol.rb:5
 else.rb:1
 else.rb:3
 else.rb:4
@@ -113,59 +105,26 @@ embdoc.rb:0
 embdoc.rb:1
 end_content.rb:0
 excessed_comma.rb:0
-field.rb:0
-for.rb:2
-for.rb:5
-for.rb:7
-for.rb:8
-hash.rb:2
-hash.rb:3
-hash.rb:4
-hash.rb:5
-hash.rb:8
 heredoc.rb:17
-hshptn.rb:0
-hshptn.rb:1
-hshptn.rb:2
-hshptn.rb:5
-hshptn.rb:6
-hshptn.rb:14
-hshptn.rb:15
 if.rb:1
 if.rb:3
 if.rb:4
 if.rb:5
 if.rb:6
 if.rb:7
 if.rb:8
-if.rb:9
 if.rb:10
 if.rb:12
 if.rb:13
 if_mod.rb:3
 ifop.rb:1
+ifop.rb:2
 ifop.rb:3
-in.rb:1
-in.rb:2
-in.rb:4
 label.rb:1
-lambda.rb:2
-lambda.rb:3
-lambda.rb:4
-lambda.rb:6
-lambda.rb:7
-lambda.rb:8
-lambda.rb:9
-lambda.rb:10
-lambda.rb:11
-lambda.rb:12
-lambda.rb:13
-lambda.rb:14
-lambda.rb:15
-lambda.rb:16
-lambda.rb:17
 lambda.rb:18
 lambda.rb:19
+lambda.rb:20
+lambda.rb:21
 massign.rb:1
 method_add_block.rb:0
 mlhs.rb:1
@@ -176,33 +135,31 @@ next.rb:15
 next.rb:16
 next.rb:17
 next.rb:18
-not.rb:1
-not.rb:2
+next.rb:19
 not.rb:3
-not.rb:4
 not.rb:5
-not.rb:6
 params.rb:23
 params.rb:34
+rassign.rb:6
 regexp_literal.rb:1
 regexp_literal.rb:2
 regexp_literal.rb:3
 regexp_literal.rb:4
 regexp_literal.rb:12
+regexp_literal.rb:14
+regexp_literal.rb:15
 regexp_literal.rb:17
 regexp_literal.rb:18
 rescue.rb:0
-rescue_mod.rb:0
 return.rb:8
 return.rb:9
+return.rb:12
 statements.rb:0
 statements.rb:1
 string_concat.rb:0
 string_embexpr.rb:5
 string_literal.rb:15
 string_literal.rb:16
-unary.rb:0
-unary.rb:1
 unless.rb:3
 unless.rb:4
 unless.rb:5

fixtures/array_literal.rb

@@ -87,5 +87,7 @@
 [:foo, "bar"]
 %
 [:foo, :"bar"]
+-
+%i[foo bar]
 %
 [foo, bar] # comment

fixtures/for.rb

@@ -38,6 +38,10 @@
 for foo, in [[foo, bar]]
   foo
 end
+-
+for foo, * in [[foo, bar]]
+  foo
+end
 %
 for foo in bar # comment1
   # comment2

fixtures/hash.rb

@@ -17,7 +17,7 @@
 %
 { bar => bar, "baz": baz }
 -
-{ bar => bar, :"baz" => baz }
+{ bar => bar, :baz => baz }
 %
 { bar: barrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr, baz: bazzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz }
 -

fixtures/hshptn.rb

@@ -2,14 +2,26 @@
 case foo
 in ** then
 end
+-
+case foo
+in { ** }
+end
 %
 case foo
 in bar:
 end
+-
+case foo
+in { bar: }
+end
 %
 case foo
 in bar: bar
 end
+-
+case foo
+in { bar: bar }
+end
 %
 case foo
 in bar:, baz:
@@ -30,6 +42,10 @@
 case foo
 in **bar
 end
+-
+case foo
+in { **bar }
+end
 % # >= 2.7.3
 case foo
 in {
@@ -74,6 +90,10 @@
 case foo
 in **nil
 end
+-
+case foo
+in { **nil }
+end
 %
 case foo
 in bar, { baz:, **nil }
@@ -82,5 +102,5 @@
 -
 case foo
 in [bar, { baz:, **nil }]
-in qux:
+in { qux: }
 end