Merge pull request #1049 from ruby/use-serialization

Use serialization for snapshots
ruby · Jun 22, 2023 · 1f2f88d · 1f2f88d
2 parents 89a0020 + d2e9655
commit 1f2f88d
Show file tree

Hide file tree

Showing 905 changed files with 39 additions and 49 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -9,3 +9,4 @@ test/fixtures/whitequark/**/*.txt linguist-vendored
 test/snapshots/**/*.txt linguist-generated
 
 test/fixtures/**/*.txt -text
+test/snapshots/**/*.txt diff=snapshot
diff --git a/bin/deserialize b/bin/deserialize
@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+$:.unshift(File.expand_path("../lib", __dir__))
+require "yarp"
+require "pp"
+
+# We don't have the original source, so this is not going to be entirely
+# accurate. But it's still better than nothing.
+class Source
+  def byteslice(*)
+    ""
+  end
+
+  def force_encoding(*)
+    self
+  end
+end
+
+puts PP.pp(YARP.load(Source.new, File.read(ARGV[0])), +"", 79)
diff --git a/docs/testing.md b/docs/testing.md
@@ -12,10 +12,17 @@ These test specific YARP implementation details like comments, errors, and regul
 
 ### Snapshot tests
 
-Snapshot tests ensure that parsed output is equivalent to previous parsed output. There are many categorized examples of valid syntax within the `test/fixtures/` directory. When the test suite runs, it will parse all of this syntax, and compare it against corresponding files in the `test/snapshots/` directory. For example, `test/fixtures/strings.rb` has a corresponding `test/snapshots/strings.rb`.
+Snapshot tests ensure that parsed output is equivalent to previous parsed output. There are many categorized examples of valid syntax within the `test/fixtures/` directory. When the test suite runs, it will parse all of this syntax, and compare it against corresponding files in the `test/snapshots/` directory. For example, `test/fixtures/strings.txt` has a corresponding `test/snapshots/strings.txt`.
 
 If the parsed files do not match, it will raise an error. If there is not a corresponding file in the `test/snapshots/` directory, one will be created so that it exists for the next test run.
 
+To get nicer diffs for snapshots, you should set up the `textconv` option in `git diff` to use `bin/deserialize`. This will deserialize the serialized tree and pretty-print it before diffing, which makes it much easier to see the changes. To do so, run:
+
+```bash
+git config diff.snapshot.textconv bin/deserialize
+git config diff.snapshot.binary true
+```
+
 ### Testing against repositories
 
 To test the parser against a repository, you can run `FILEPATHS='/path/to/repository/**/*.rb' rake lex`. This will run the parser against every file matched by the glob pattern and check its generated tokens against those generated by ripper.

diff --git a/test/parse_test.rb b/test/parse_test.rb
@@ -3,19 +3,6 @@
 require "yarp_test_helper"
 
 class ParseTest < Test::Unit::TestCase
-  # Because we're reading the snapshots from disk, we need to make sure that
-  # they're encoded as UTF-8. When certain settings are present this might not
-  # always be the case (e.g., LANG=C or -Eascii-8bit). So here we force the
-  # default external encoding for the duration of the test.
-  def setup
-    @previous_default_external = Encoding.default_external
-    ignore_warnings { Encoding.default_external = Encoding::UTF_8 }
-  end
-
-  def teardown
-    ignore_warnings { Encoding.default_external = @previous_default_external }
-  end
-
   def test_Ruby_3_2_plus
     assert_operator RUBY_VERSION, :>=, "3.2.0", "ParseTest requires Ruby 3.2+"
   end
@@ -29,20 +16,6 @@ def test_empty_string
     seattlerb/pct_w_heredoc_interp_nested.txt
   ]
 
-  # Because the filepath in SourceFileNodes is different from one maching to the
-  # next, PP.pp(sexp, +"", 79) can have different results: both the path itself
-  # and the line breaks based on the length of the path.
-  def normalize_printed(printed)
-    printed
-      .gsub(
-        /SourceFileNode \s*
-          \(\s* (\d+\.\.\.\d+) \s*\) \s*
-          \(\s* ("[^"]*")      \s*\)
-        /mx,
-        'SourceFileNode(\1)(\2)')
-      .gsub(__dir__, "")
-  end
-
   def find_source_file_node(node)
     if node.is_a?(YARP::SourceFileNode)
       node
@@ -78,36 +51,35 @@ def test_parse_takes_file_path
       # that is invalid Ruby.
       refute_nil Ripper.sexp_raw(source)
 
-      # Next, parse the source and print the value.
+      # Next, assert that there were no errors during parsing.
       result = YARP.parse_file(filepath)
-      value = result.value
-      printed = normalize_printed(PP.pp(value, +"", 79))
+      assert_empty result.errors
 
-      # Next, assert that there were no errors during parsing.
-      assert_empty result.errors, value
+      # Next, parse the source and print the value.
+      serialized = YARP.dump(source, relative)
 
       if File.exist?(snapshot)
-        normalized = normalize_printed(File.read(snapshot))
+        saved = File.binread(snapshot)
 
         # If the snapshot file exists, but the printed value does not match the
         # snapshot, then update the snapshot file.
-        if normalized != printed
-          File.write(snapshot, normalized)
+        if serialized != saved
+          File.write(snapshot, serialized)
           warn("Updated snapshot at #{snapshot}.")
         end
 
         # If the snapshot file exists, then assert that the printed value
         # matches the snapshot.
-        assert_equal(normalized, printed)
+        assert_equal(saved, serialized)
       else
         # If the snapshot file does not yet exist, then write it out now.
-        File.write(snapshot, printed)
+        File.write(snapshot, serialized)
         warn("Created snapshot at #{snapshot}.")
       end
 
       # Next, assert that the value can be serialized and deserialized without
       # changing the shape of the tree.
-      assert_equal_nodes(value, YARP.load(source, YARP.dump(source, filepath)))
+      assert_equal_nodes(result.value, YARP.load(source, YARP.dump(source, relative)))
 
       # Next, assert that the newlines are in the expected places.
       expected_newlines = [0]
@@ -127,14 +99,4 @@ def test_parse_takes_file_path
       end
     end
   end
-
-  private
-
-  def ignore_warnings
-    previous_verbosity = $VERBOSE
-    $VERBOSE = nil
-    yield
-  ensure
-    $VERBOSE = previous_verbosity
-  end
 end
diff --git a/test/snapshots/alias.txt b/test/snapshots/alias.txt
diff --git a/test/snapshots/arithmetic.txt b/test/snapshots/arithmetic.txt
diff --git a/test/snapshots/arrays.txt b/test/snapshots/arrays.txt
diff --git a/test/snapshots/begin_ensure.txt b/test/snapshots/begin_ensure.txt
diff --git a/test/snapshots/begin_rescue.txt b/test/snapshots/begin_rescue.txt
diff --git a/test/snapshots/blocks.txt b/test/snapshots/blocks.txt
diff --git a/test/snapshots/boolean_operators.txt b/test/snapshots/boolean_operators.txt
diff --git a/test/snapshots/booleans.txt b/test/snapshots/booleans.txt
diff --git a/test/snapshots/break.txt b/test/snapshots/break.txt
diff --git a/test/snapshots/case.txt b/test/snapshots/case.txt
diff --git a/test/snapshots/classes.txt b/test/snapshots/classes.txt
diff --git a/test/snapshots/comments.txt b/test/snapshots/comments.txt
diff --git a/test/snapshots/constants.txt b/test/snapshots/constants.txt
diff --git a/test/snapshots/dash_heredocs.txt b/test/snapshots/dash_heredocs.txt
diff --git a/test/snapshots/defined.txt b/test/snapshots/defined.txt
diff --git a/test/snapshots/dos_endings.txt b/test/snapshots/dos_endings.txt
diff --git a/test/snapshots/embdoc_no_newline_at_end.txt b/test/snapshots/embdoc_no_newline_at_end.txt
diff --git a/test/snapshots/for.txt b/test/snapshots/for.txt
diff --git a/test/snapshots/global_variables.txt b/test/snapshots/global_variables.txt
diff --git a/test/snapshots/hashes.txt b/test/snapshots/hashes.txt
diff --git a/test/snapshots/heredoc_with_trailing_newline.txt b/test/snapshots/heredoc_with_trailing_newline.txt
diff --git a/test/snapshots/heredocs_nested.txt b/test/snapshots/heredocs_nested.txt
diff --git a/test/snapshots/heredocs_with_ignored_newlines.txt b/test/snapshots/heredocs_with_ignored_newlines.txt
diff --git a/test/snapshots/heredocs_with_ignored_newlines_and_non_empty.txt b/test/snapshots/heredocs_with_ignored_newlines_and_non_empty.txt
diff --git a/test/snapshots/if.txt b/test/snapshots/if.txt
diff --git a/test/snapshots/integer_operations.txt b/test/snapshots/integer_operations.txt
diff --git a/test/snapshots/keyword_method_names.txt b/test/snapshots/keyword_method_names.txt
diff --git a/test/snapshots/keywords.txt b/test/snapshots/keywords.txt
diff --git a/test/snapshots/lambda.txt b/test/snapshots/lambda.txt
diff --git a/test/snapshots/method_calls.txt b/test/snapshots/method_calls.txt
diff --git a/test/snapshots/methods.txt b/test/snapshots/methods.txt
diff --git a/test/snapshots/modules.txt b/test/snapshots/modules.txt
diff --git a/test/snapshots/next.txt b/test/snapshots/next.txt
diff --git a/test/snapshots/nils.txt b/test/snapshots/nils.txt
diff --git a/test/snapshots/non_alphanumeric_methods.txt b/test/snapshots/non_alphanumeric_methods.txt
diff --git a/test/snapshots/not.txt b/test/snapshots/not.txt
diff --git a/test/snapshots/numbers.txt b/test/snapshots/numbers.txt
diff --git a/test/snapshots/patterns.txt b/test/snapshots/patterns.txt
diff --git a/test/snapshots/procs.txt b/test/snapshots/procs.txt
diff --git a/test/snapshots/range_begin_open_exclusive.txt b/test/snapshots/range_begin_open_exclusive.txt
diff --git a/test/snapshots/range_begin_open_inclusive.txt b/test/snapshots/range_begin_open_inclusive.txt
diff --git a/test/snapshots/range_end_open_exclusive.txt b/test/snapshots/range_end_open_exclusive.txt
diff --git a/test/snapshots/range_end_open_inclusive.txt b/test/snapshots/range_end_open_inclusive.txt
diff --git a/test/snapshots/ranges.txt b/test/snapshots/ranges.txt
diff --git a/test/snapshots/regex.txt b/test/snapshots/regex.txt
diff --git a/test/snapshots/rescue.txt b/test/snapshots/rescue.txt
diff --git a/test/snapshots/return.txt b/test/snapshots/return.txt
diff --git a/test/snapshots/seattlerb/BEGIN.txt b/test/snapshots/seattlerb/BEGIN.txt
diff --git a/test/snapshots/seattlerb/__ENCODING__.txt b/test/snapshots/seattlerb/__ENCODING__.txt
diff --git a/test/snapshots/seattlerb/alias_gvar_backref.txt b/test/snapshots/seattlerb/alias_gvar_backref.txt
diff --git a/test/snapshots/seattlerb/alias_resword.txt b/test/snapshots/seattlerb/alias_resword.txt
diff --git a/test/snapshots/seattlerb/and_multi.txt b/test/snapshots/seattlerb/and_multi.txt
diff --git a/test/snapshots/seattlerb/aref_args_assocs.txt b/test/snapshots/seattlerb/aref_args_assocs.txt
diff --git a/test/snapshots/seattlerb/aref_args_lit_assocs.txt b/test/snapshots/seattlerb/aref_args_lit_assocs.txt
diff --git a/test/snapshots/seattlerb/args_kw_block.txt b/test/snapshots/seattlerb/args_kw_block.txt
diff --git a/test/snapshots/seattlerb/array_line_breaks.txt b/test/snapshots/seattlerb/array_line_breaks.txt
diff --git a/test/snapshots/seattlerb/array_lits_trailing_calls.txt b/test/snapshots/seattlerb/array_lits_trailing_calls.txt
diff --git a/test/snapshots/seattlerb/assoc__bare.txt b/test/snapshots/seattlerb/assoc__bare.txt
diff --git a/test/snapshots/seattlerb/assoc_label.txt b/test/snapshots/seattlerb/assoc_label.txt
diff --git a/test/snapshots/seattlerb/attr_asgn_colon_id.txt b/test/snapshots/seattlerb/attr_asgn_colon_id.txt
diff --git a/test/snapshots/seattlerb/attrasgn_array_arg.txt b/test/snapshots/seattlerb/attrasgn_array_arg.txt
diff --git a/test/snapshots/seattlerb/attrasgn_array_lhs.txt b/test/snapshots/seattlerb/attrasgn_array_lhs.txt
diff --git a/test/snapshots/seattlerb/attrasgn_primary_dot_constant.txt b/test/snapshots/seattlerb/attrasgn_primary_dot_constant.txt
diff --git a/test/snapshots/seattlerb/backticks_interpolation_line.txt b/test/snapshots/seattlerb/backticks_interpolation_line.txt
diff --git a/test/snapshots/seattlerb/bang_eq.txt b/test/snapshots/seattlerb/bang_eq.txt
diff --git a/test/snapshots/seattlerb/bdot2.txt b/test/snapshots/seattlerb/bdot2.txt
diff --git a/test/snapshots/seattlerb/bdot3.txt b/test/snapshots/seattlerb/bdot3.txt
diff --git a/test/snapshots/seattlerb/begin_ensure_no_bodies.txt b/test/snapshots/seattlerb/begin_ensure_no_bodies.txt
diff --git a/test/snapshots/seattlerb/begin_rescue_else_ensure_bodies.txt b/test/snapshots/seattlerb/begin_rescue_else_ensure_bodies.txt
diff --git a/test/snapshots/seattlerb/begin_rescue_else_ensure_no_bodies.txt b/test/snapshots/seattlerb/begin_rescue_else_ensure_no_bodies.txt
diff --git a/test/snapshots/seattlerb/begin_rescue_ensure_no_bodies.txt b/test/snapshots/seattlerb/begin_rescue_ensure_no_bodies.txt
diff --git a/test/snapshots/seattlerb/block_arg__bare.txt b/test/snapshots/seattlerb/block_arg__bare.txt
diff --git a/test/snapshots/seattlerb/block_arg_kwsplat.txt b/test/snapshots/seattlerb/block_arg_kwsplat.txt
diff --git a/test/snapshots/seattlerb/block_arg_opt_arg_block.txt b/test/snapshots/seattlerb/block_arg_opt_arg_block.txt
diff --git a/test/snapshots/seattlerb/block_arg_opt_splat.txt b/test/snapshots/seattlerb/block_arg_opt_splat.txt
diff --git a/test/snapshots/seattlerb/block_arg_opt_splat_arg_block_omfg.txt b/test/snapshots/seattlerb/block_arg_opt_splat_arg_block_omfg.txt
diff --git a/test/snapshots/seattlerb/block_arg_optional.txt b/test/snapshots/seattlerb/block_arg_optional.txt
diff --git a/test/snapshots/seattlerb/block_arg_scope.txt b/test/snapshots/seattlerb/block_arg_scope.txt
diff --git a/test/snapshots/seattlerb/block_arg_scope2.txt b/test/snapshots/seattlerb/block_arg_scope2.txt
diff --git a/test/snapshots/seattlerb/block_arg_splat_arg.txt b/test/snapshots/seattlerb/block_arg_splat_arg.txt
diff --git a/test/snapshots/seattlerb/block_args_kwargs.txt b/test/snapshots/seattlerb/block_args_kwargs.txt
diff --git a/test/snapshots/seattlerb/block_args_no_kwargs.txt b/test/snapshots/seattlerb/block_args_no_kwargs.txt
diff --git a/test/snapshots/seattlerb/block_args_opt1.txt b/test/snapshots/seattlerb/block_args_opt1.txt
diff --git a/test/snapshots/seattlerb/block_args_opt2.txt b/test/snapshots/seattlerb/block_args_opt2.txt
diff --git a/test/snapshots/seattlerb/block_args_opt2_2.txt b/test/snapshots/seattlerb/block_args_opt2_2.txt
diff --git a/test/snapshots/seattlerb/block_args_opt3.txt b/test/snapshots/seattlerb/block_args_opt3.txt
diff --git a/test/snapshots/seattlerb/block_break.txt b/test/snapshots/seattlerb/block_break.txt
diff --git a/test/snapshots/seattlerb/block_call_defn_call_block_call.txt b/test/snapshots/seattlerb/block_call_defn_call_block_call.txt
diff --git a/test/snapshots/seattlerb/block_call_dot_op2_brace_block.txt b/test/snapshots/seattlerb/block_call_dot_op2_brace_block.txt
diff --git a/test/snapshots/seattlerb/block_call_dot_op2_cmd_args_do_block.txt b/test/snapshots/seattlerb/block_call_dot_op2_cmd_args_do_block.txt
diff --git a/test/snapshots/seattlerb/block_call_operation_colon.txt b/test/snapshots/seattlerb/block_call_operation_colon.txt
diff --git a/test/snapshots/seattlerb/block_call_operation_dot.txt b/test/snapshots/seattlerb/block_call_operation_dot.txt
diff --git a/test/snapshots/seattlerb/block_call_paren_call_block_call.txt b/test/snapshots/seattlerb/block_call_paren_call_block_call.txt
diff --git a/test/snapshots/seattlerb/block_command_operation_colon.txt b/test/snapshots/seattlerb/block_command_operation_colon.txt
diff --git a/test/snapshots/seattlerb/block_command_operation_dot.txt b/test/snapshots/seattlerb/block_command_operation_dot.txt
diff --git a/test/snapshots/seattlerb/block_decomp_anon_splat_arg.txt b/test/snapshots/seattlerb/block_decomp_anon_splat_arg.txt
diff --git a/test/snapshots/seattlerb/block_decomp_arg_splat.txt b/test/snapshots/seattlerb/block_decomp_arg_splat.txt
diff --git a/test/snapshots/seattlerb/block_decomp_arg_splat_arg.txt b/test/snapshots/seattlerb/block_decomp_arg_splat_arg.txt
diff --git a/test/snapshots/seattlerb/block_decomp_splat.txt b/test/snapshots/seattlerb/block_decomp_splat.txt
diff --git a/test/snapshots/seattlerb/block_kw.txt b/test/snapshots/seattlerb/block_kw.txt
diff --git a/test/snapshots/seattlerb/block_kw__required.txt b/test/snapshots/seattlerb/block_kw__required.txt
diff --git a/test/snapshots/seattlerb/block_kwarg_lvar.txt b/test/snapshots/seattlerb/block_kwarg_lvar.txt
diff --git a/test/snapshots/seattlerb/block_kwarg_lvar_multiple.txt b/test/snapshots/seattlerb/block_kwarg_lvar_multiple.txt
diff --git a/test/snapshots/seattlerb/block_next.txt b/test/snapshots/seattlerb/block_next.txt
diff --git a/test/snapshots/seattlerb/block_opt_arg.txt b/test/snapshots/seattlerb/block_opt_arg.txt
diff --git a/test/snapshots/seattlerb/block_opt_splat.txt b/test/snapshots/seattlerb/block_opt_splat.txt
diff --git a/test/snapshots/seattlerb/block_opt_splat_arg_block_omfg.txt b/test/snapshots/seattlerb/block_opt_splat_arg_block_omfg.txt
diff --git a/test/snapshots/seattlerb/block_optarg.txt b/test/snapshots/seattlerb/block_optarg.txt
diff --git a/test/snapshots/seattlerb/block_paren_splat.txt b/test/snapshots/seattlerb/block_paren_splat.txt
diff --git a/test/snapshots/seattlerb/block_reg_optarg.txt b/test/snapshots/seattlerb/block_reg_optarg.txt
diff --git a/test/snapshots/seattlerb/block_return.txt b/test/snapshots/seattlerb/block_return.txt
diff --git a/test/snapshots/seattlerb/block_scope.txt b/test/snapshots/seattlerb/block_scope.txt
diff --git a/test/snapshots/seattlerb/block_splat_reg.txt b/test/snapshots/seattlerb/block_splat_reg.txt
diff --git a/test/snapshots/seattlerb/bug169.txt b/test/snapshots/seattlerb/bug169.txt
diff --git a/test/snapshots/seattlerb/bug179.txt b/test/snapshots/seattlerb/bug179.txt
diff --git a/test/snapshots/seattlerb/bug190.txt b/test/snapshots/seattlerb/bug190.txt
diff --git a/test/snapshots/seattlerb/bug191.txt b/test/snapshots/seattlerb/bug191.txt
diff --git a/test/snapshots/seattlerb/bug202.txt b/test/snapshots/seattlerb/bug202.txt
diff --git a/test/snapshots/seattlerb/bug236.txt b/test/snapshots/seattlerb/bug236.txt
diff --git a/test/snapshots/seattlerb/bug290.txt b/test/snapshots/seattlerb/bug290.txt
diff --git a/test/snapshots/seattlerb/bug_187.txt b/test/snapshots/seattlerb/bug_187.txt
diff --git a/test/snapshots/seattlerb/bug_215.txt b/test/snapshots/seattlerb/bug_215.txt
diff --git a/test/snapshots/seattlerb/bug_249.txt b/test/snapshots/seattlerb/bug_249.txt
diff --git a/test/snapshots/seattlerb/bug_and.txt b/test/snapshots/seattlerb/bug_and.txt
diff --git a/test/snapshots/seattlerb/bug_args__19.txt b/test/snapshots/seattlerb/bug_args__19.txt
diff --git a/test/snapshots/seattlerb/bug_args_masgn.txt b/test/snapshots/seattlerb/bug_args_masgn.txt
diff --git a/test/snapshots/seattlerb/bug_args_masgn2.txt b/test/snapshots/seattlerb/bug_args_masgn2.txt
diff --git a/test/snapshots/seattlerb/bug_args_masgn_outer_parens__19.txt b/test/snapshots/seattlerb/bug_args_masgn_outer_parens__19.txt
diff --git a/test/snapshots/seattlerb/bug_call_arglist_parens.txt b/test/snapshots/seattlerb/bug_call_arglist_parens.txt
diff --git a/test/snapshots/seattlerb/bug_case_when_regexp.txt b/test/snapshots/seattlerb/bug_case_when_regexp.txt
diff --git a/test/snapshots/seattlerb/bug_comma.txt b/test/snapshots/seattlerb/bug_comma.txt
diff --git a/test/snapshots/seattlerb/bug_cond_pct.txt b/test/snapshots/seattlerb/bug_cond_pct.txt
diff --git a/test/snapshots/seattlerb/bug_hash_args.txt b/test/snapshots/seattlerb/bug_hash_args.txt
diff --git a/test/snapshots/seattlerb/bug_hash_args_trailing_comma.txt b/test/snapshots/seattlerb/bug_hash_args_trailing_comma.txt
diff --git a/test/snapshots/seattlerb/bug_hash_interp_array.txt b/test/snapshots/seattlerb/bug_hash_interp_array.txt
diff --git a/test/snapshots/seattlerb/bug_masgn_right.txt b/test/snapshots/seattlerb/bug_masgn_right.txt
diff --git a/test/snapshots/seattlerb/bug_not_parens.txt b/test/snapshots/seattlerb/bug_not_parens.txt
diff --git a/test/snapshots/seattlerb/bug_op_asgn_rescue.txt b/test/snapshots/seattlerb/bug_op_asgn_rescue.txt
diff --git a/test/snapshots/seattlerb/call_and.txt b/test/snapshots/seattlerb/call_and.txt
diff --git a/test/snapshots/seattlerb/call_arg_assoc.txt b/test/snapshots/seattlerb/call_arg_assoc.txt
diff --git a/test/snapshots/seattlerb/call_arg_assoc_kwsplat.txt b/test/snapshots/seattlerb/call_arg_assoc_kwsplat.txt
diff --git a/test/snapshots/seattlerb/call_arg_kwsplat.txt b/test/snapshots/seattlerb/call_arg_kwsplat.txt
diff --git a/test/snapshots/seattlerb/call_args_assoc_quoted.txt b/test/snapshots/seattlerb/call_args_assoc_quoted.txt
diff --git a/test/snapshots/seattlerb/call_args_assoc_trailing_comma.txt b/test/snapshots/seattlerb/call_args_assoc_trailing_comma.txt
diff --git a/test/snapshots/seattlerb/call_args_command.txt b/test/snapshots/seattlerb/call_args_command.txt
diff --git a/test/snapshots/seattlerb/call_array_arg.txt b/test/snapshots/seattlerb/call_array_arg.txt
diff --git a/test/snapshots/seattlerb/call_array_block_call.txt b/test/snapshots/seattlerb/call_array_block_call.txt
diff --git a/test/snapshots/seattlerb/call_array_lambda_block_call.txt b/test/snapshots/seattlerb/call_array_lambda_block_call.txt
diff --git a/test/snapshots/seattlerb/call_array_lit_inline_hash.txt b/test/snapshots/seattlerb/call_array_lit_inline_hash.txt
diff --git a/test/snapshots/seattlerb/call_assoc.txt b/test/snapshots/seattlerb/call_assoc.txt
diff --git a/test/snapshots/seattlerb/call_assoc_new.txt b/test/snapshots/seattlerb/call_assoc_new.txt
diff --git a/test/snapshots/seattlerb/call_assoc_new_if_multiline.txt b/test/snapshots/seattlerb/call_assoc_new_if_multiline.txt
diff --git a/test/snapshots/seattlerb/call_assoc_trailing_comma.txt b/test/snapshots/seattlerb/call_assoc_trailing_comma.txt
diff --git a/test/snapshots/seattlerb/call_bang_command_call.txt b/test/snapshots/seattlerb/call_bang_command_call.txt
diff --git a/test/snapshots/seattlerb/call_bang_squiggle.txt b/test/snapshots/seattlerb/call_bang_squiggle.txt
diff --git a/test/snapshots/seattlerb/call_begin_call_block_call.txt b/test/snapshots/seattlerb/call_begin_call_block_call.txt
diff --git a/test/snapshots/seattlerb/call_block_arg_named.txt b/test/snapshots/seattlerb/call_block_arg_named.txt
diff --git a/test/snapshots/seattlerb/call_carat.txt b/test/snapshots/seattlerb/call_carat.txt
diff --git a/test/snapshots/seattlerb/call_colon2.txt b/test/snapshots/seattlerb/call_colon2.txt
diff --git a/test/snapshots/seattlerb/call_colon_parens.txt b/test/snapshots/seattlerb/call_colon_parens.txt
diff --git a/test/snapshots/seattlerb/call_div.txt b/test/snapshots/seattlerb/call_div.txt
diff --git a/test/snapshots/seattlerb/call_dot_parens.txt b/test/snapshots/seattlerb/call_dot_parens.txt
diff --git a/test/snapshots/seattlerb/call_env.txt b/test/snapshots/seattlerb/call_env.txt
diff --git a/test/snapshots/seattlerb/call_eq3.txt b/test/snapshots/seattlerb/call_eq3.txt
diff --git a/test/snapshots/seattlerb/call_gt.txt b/test/snapshots/seattlerb/call_gt.txt
diff --git a/test/snapshots/seattlerb/call_kwsplat.txt b/test/snapshots/seattlerb/call_kwsplat.txt
diff --git a/test/snapshots/seattlerb/call_leading_dots.txt b/test/snapshots/seattlerb/call_leading_dots.txt
diff --git a/test/snapshots/seattlerb/call_leading_dots_comment.txt b/test/snapshots/seattlerb/call_leading_dots_comment.txt
diff --git a/test/snapshots/seattlerb/call_lt.txt b/test/snapshots/seattlerb/call_lt.txt
diff --git a/test/snapshots/seattlerb/call_lte.txt b/test/snapshots/seattlerb/call_lte.txt
diff --git a/test/snapshots/seattlerb/call_not.txt b/test/snapshots/seattlerb/call_not.txt
diff --git a/test/snapshots/seattlerb/call_pipe.txt b/test/snapshots/seattlerb/call_pipe.txt
diff --git a/test/snapshots/seattlerb/call_rshift.txt b/test/snapshots/seattlerb/call_rshift.txt
diff --git a/test/snapshots/seattlerb/call_self_brackets.txt b/test/snapshots/seattlerb/call_self_brackets.txt
diff --git a/test/snapshots/seattlerb/call_spaceship.txt b/test/snapshots/seattlerb/call_spaceship.txt
diff --git a/test/snapshots/seattlerb/call_stabby_do_end_with_block.txt b/test/snapshots/seattlerb/call_stabby_do_end_with_block.txt
diff --git a/test/snapshots/seattlerb/call_stabby_with_braces_block.txt b/test/snapshots/seattlerb/call_stabby_with_braces_block.txt
diff --git a/test/snapshots/seattlerb/call_star.txt b/test/snapshots/seattlerb/call_star.txt
diff --git a/test/snapshots/seattlerb/call_star2.txt b/test/snapshots/seattlerb/call_star2.txt
diff --git a/test/snapshots/seattlerb/call_trailing_comma.txt b/test/snapshots/seattlerb/call_trailing_comma.txt
diff --git a/test/snapshots/seattlerb/call_trailing_dots.txt b/test/snapshots/seattlerb/call_trailing_dots.txt
diff --git a/test/snapshots/seattlerb/call_unary_bang.txt b/test/snapshots/seattlerb/call_unary_bang.txt
diff --git a/test/snapshots/seattlerb/case_in.txt b/test/snapshots/seattlerb/case_in.txt
diff --git a/test/snapshots/seattlerb/case_in_31.txt b/test/snapshots/seattlerb/case_in_31.txt
diff --git a/test/snapshots/seattlerb/case_in_37.txt b/test/snapshots/seattlerb/case_in_37.txt
diff --git a/test/snapshots/seattlerb/case_in_42.txt b/test/snapshots/seattlerb/case_in_42.txt
diff --git a/test/snapshots/seattlerb/case_in_42_2.txt b/test/snapshots/seattlerb/case_in_42_2.txt
diff --git a/test/snapshots/seattlerb/case_in_47.txt b/test/snapshots/seattlerb/case_in_47.txt
diff --git a/test/snapshots/seattlerb/case_in_67.txt b/test/snapshots/seattlerb/case_in_67.txt
diff --git a/test/snapshots/seattlerb/case_in_86.txt b/test/snapshots/seattlerb/case_in_86.txt
diff --git a/test/snapshots/seattlerb/case_in_86_2.txt b/test/snapshots/seattlerb/case_in_86_2.txt
diff --git a/test/snapshots/seattlerb/case_in_array_pat_const.txt b/test/snapshots/seattlerb/case_in_array_pat_const.txt
diff --git a/test/snapshots/seattlerb/case_in_array_pat_const2.txt b/test/snapshots/seattlerb/case_in_array_pat_const2.txt
diff --git a/test/snapshots/seattlerb/case_in_array_pat_paren_assign.txt b/test/snapshots/seattlerb/case_in_array_pat_paren_assign.txt
diff --git a/test/snapshots/seattlerb/case_in_const.txt b/test/snapshots/seattlerb/case_in_const.txt
diff --git a/test/snapshots/seattlerb/case_in_else.txt b/test/snapshots/seattlerb/case_in_else.txt
diff --git a/test/snapshots/seattlerb/case_in_find.txt b/test/snapshots/seattlerb/case_in_find.txt
diff --git a/test/snapshots/seattlerb/case_in_find_array.txt b/test/snapshots/seattlerb/case_in_find_array.txt
diff --git a/test/snapshots/seattlerb/case_in_hash_pat.txt b/test/snapshots/seattlerb/case_in_hash_pat.txt
diff --git a/test/snapshots/seattlerb/case_in_hash_pat_assign.txt b/test/snapshots/seattlerb/case_in_hash_pat_assign.txt
diff --git a/test/snapshots/seattlerb/case_in_hash_pat_paren_assign.txt b/test/snapshots/seattlerb/case_in_hash_pat_paren_assign.txt
diff --git a/test/snapshots/seattlerb/case_in_hash_pat_paren_true.txt b/test/snapshots/seattlerb/case_in_hash_pat_paren_true.txt
diff --git a/test/snapshots/seattlerb/case_in_hash_pat_rest.txt b/test/snapshots/seattlerb/case_in_hash_pat_rest.txt
diff --git a/test/snapshots/seattlerb/case_in_hash_pat_rest_solo.txt b/test/snapshots/seattlerb/case_in_hash_pat_rest_solo.txt
diff --git a/test/snapshots/seattlerb/case_in_if_unless_post_mod.txt b/test/snapshots/seattlerb/case_in_if_unless_post_mod.txt
diff --git a/test/snapshots/seattlerb/case_in_multiple.txt b/test/snapshots/seattlerb/case_in_multiple.txt
diff --git a/test/snapshots/seattlerb/case_in_or.txt b/test/snapshots/seattlerb/case_in_or.txt
diff --git a/test/snapshots/seattlerb/class_comments.txt b/test/snapshots/seattlerb/class_comments.txt
diff --git a/test/snapshots/seattlerb/cond_unary_minus.txt b/test/snapshots/seattlerb/cond_unary_minus.txt
diff --git a/test/snapshots/seattlerb/const_2_op_asgn_or2.txt b/test/snapshots/seattlerb/const_2_op_asgn_or2.txt
diff --git a/test/snapshots/seattlerb/const_3_op_asgn_or.txt b/test/snapshots/seattlerb/const_3_op_asgn_or.txt
diff --git a/test/snapshots/seattlerb/const_op_asgn_and1.txt b/test/snapshots/seattlerb/const_op_asgn_and1.txt
diff --git a/test/snapshots/seattlerb/const_op_asgn_and2.txt b/test/snapshots/seattlerb/const_op_asgn_and2.txt
diff --git a/test/snapshots/seattlerb/const_op_asgn_or.txt b/test/snapshots/seattlerb/const_op_asgn_or.txt
diff --git a/test/snapshots/seattlerb/dasgn_icky2.txt b/test/snapshots/seattlerb/dasgn_icky2.txt
diff --git a/test/snapshots/seattlerb/defined_eh_parens.txt b/test/snapshots/seattlerb/defined_eh_parens.txt
diff --git a/test/snapshots/seattlerb/defn_arg_asplat_arg.txt b/test/snapshots/seattlerb/defn_arg_asplat_arg.txt
diff --git a/test/snapshots/seattlerb/defn_arg_forward_args.txt b/test/snapshots/seattlerb/defn_arg_forward_args.txt
diff --git a/test/snapshots/seattlerb/defn_args_forward_args.txt b/test/snapshots/seattlerb/defn_args_forward_args.txt
diff --git a/test/snapshots/seattlerb/defn_comments.txt b/test/snapshots/seattlerb/defn_comments.txt
diff --git a/test/snapshots/seattlerb/defn_endless_command.txt b/test/snapshots/seattlerb/defn_endless_command.txt
diff --git a/test/snapshots/seattlerb/defn_endless_command_rescue.txt b/test/snapshots/seattlerb/defn_endless_command_rescue.txt
diff --git a/test/snapshots/seattlerb/defn_forward_args.txt b/test/snapshots/seattlerb/defn_forward_args.txt
diff --git a/test/snapshots/seattlerb/defn_kwarg_env.txt b/test/snapshots/seattlerb/defn_kwarg_env.txt
diff --git a/test/snapshots/seattlerb/defn_kwarg_kwarg.txt b/test/snapshots/seattlerb/defn_kwarg_kwarg.txt
diff --git a/test/snapshots/seattlerb/defn_kwarg_kwsplat.txt b/test/snapshots/seattlerb/defn_kwarg_kwsplat.txt
diff --git a/test/snapshots/seattlerb/defn_kwarg_kwsplat_anon.txt b/test/snapshots/seattlerb/defn_kwarg_kwsplat_anon.txt
diff --git a/test/snapshots/seattlerb/defn_kwarg_lvar.txt b/test/snapshots/seattlerb/defn_kwarg_lvar.txt
diff --git a/test/snapshots/seattlerb/defn_kwarg_no_parens.txt b/test/snapshots/seattlerb/defn_kwarg_no_parens.txt
diff --git a/test/snapshots/seattlerb/defn_kwarg_val.txt b/test/snapshots/seattlerb/defn_kwarg_val.txt
diff --git a/test/snapshots/seattlerb/defn_no_kwargs.txt b/test/snapshots/seattlerb/defn_no_kwargs.txt
diff --git a/test/snapshots/seattlerb/defn_oneliner.txt b/test/snapshots/seattlerb/defn_oneliner.txt
diff --git a/test/snapshots/seattlerb/defn_oneliner_eq2.txt b/test/snapshots/seattlerb/defn_oneliner_eq2.txt
diff --git a/test/snapshots/seattlerb/defn_oneliner_noargs.txt b/test/snapshots/seattlerb/defn_oneliner_noargs.txt
diff --git a/test/snapshots/seattlerb/defn_oneliner_noargs_parentheses.txt b/test/snapshots/seattlerb/defn_oneliner_noargs_parentheses.txt
diff --git a/test/snapshots/seattlerb/defn_oneliner_rescue.txt b/test/snapshots/seattlerb/defn_oneliner_rescue.txt
diff --git a/test/snapshots/seattlerb/defn_opt_last_arg.txt b/test/snapshots/seattlerb/defn_opt_last_arg.txt
diff --git a/test/snapshots/seattlerb/defn_opt_reg.txt b/test/snapshots/seattlerb/defn_opt_reg.txt
diff --git a/test/snapshots/seattlerb/defn_opt_splat_arg.txt b/test/snapshots/seattlerb/defn_opt_splat_arg.txt
diff --git a/test/snapshots/seattlerb/defn_powarg.txt b/test/snapshots/seattlerb/defn_powarg.txt
diff --git a/test/snapshots/seattlerb/defn_reg_opt_reg.txt b/test/snapshots/seattlerb/defn_reg_opt_reg.txt
diff --git a/test/snapshots/seattlerb/defn_splat_arg.txt b/test/snapshots/seattlerb/defn_splat_arg.txt
diff --git a/test/snapshots/seattlerb/defn_unary_not.txt b/test/snapshots/seattlerb/defn_unary_not.txt
diff --git a/test/snapshots/seattlerb/defns_reserved.txt b/test/snapshots/seattlerb/defns_reserved.txt
diff --git a/test/snapshots/seattlerb/defs_as_arg_with_do_block_inside.txt b/test/snapshots/seattlerb/defs_as_arg_with_do_block_inside.txt
diff --git a/test/snapshots/seattlerb/defs_comments.txt b/test/snapshots/seattlerb/defs_comments.txt
diff --git a/test/snapshots/seattlerb/defs_endless_command.txt b/test/snapshots/seattlerb/defs_endless_command.txt
diff --git a/test/snapshots/seattlerb/defs_endless_command_rescue.txt b/test/snapshots/seattlerb/defs_endless_command_rescue.txt
diff --git a/test/snapshots/seattlerb/defs_kwarg.txt b/test/snapshots/seattlerb/defs_kwarg.txt
diff --git a/test/snapshots/seattlerb/defs_oneliner.txt b/test/snapshots/seattlerb/defs_oneliner.txt
diff --git a/test/snapshots/seattlerb/defs_oneliner_eq2.txt b/test/snapshots/seattlerb/defs_oneliner_eq2.txt
diff --git a/test/snapshots/seattlerb/defs_oneliner_rescue.txt b/test/snapshots/seattlerb/defs_oneliner_rescue.txt
diff --git a/test/snapshots/seattlerb/do_bug.txt b/test/snapshots/seattlerb/do_bug.txt
diff --git a/test/snapshots/seattlerb/do_lambda.txt b/test/snapshots/seattlerb/do_lambda.txt
diff --git a/test/snapshots/seattlerb/dot2_nil__26.txt b/test/snapshots/seattlerb/dot2_nil__26.txt
diff --git a/test/snapshots/seattlerb/dot3_nil__26.txt b/test/snapshots/seattlerb/dot3_nil__26.txt
diff --git a/test/snapshots/seattlerb/dstr_evstr.txt b/test/snapshots/seattlerb/dstr_evstr.txt
diff --git a/test/snapshots/seattlerb/dstr_evstr_empty_end.txt b/test/snapshots/seattlerb/dstr_evstr_empty_end.txt
diff --git a/test/snapshots/seattlerb/dstr_lex_state.txt b/test/snapshots/seattlerb/dstr_lex_state.txt
diff --git a/test/snapshots/seattlerb/dstr_str.txt b/test/snapshots/seattlerb/dstr_str.txt
diff --git a/test/snapshots/seattlerb/dsym_esc_to_sym.txt b/test/snapshots/seattlerb/dsym_esc_to_sym.txt
diff --git a/test/snapshots/seattlerb/dsym_to_sym.txt b/test/snapshots/seattlerb/dsym_to_sym.txt
diff --git a/test/snapshots/seattlerb/eq_begin_line_numbers.txt b/test/snapshots/seattlerb/eq_begin_line_numbers.txt
diff --git a/test/snapshots/seattlerb/eq_begin_why_wont_people_use_their_spacebar.txt b/test/snapshots/seattlerb/eq_begin_why_wont_people_use_their_spacebar.txt
diff --git a/test/snapshots/seattlerb/evstr_evstr.txt b/test/snapshots/seattlerb/evstr_evstr.txt
diff --git a/test/snapshots/seattlerb/evstr_str.txt b/test/snapshots/seattlerb/evstr_str.txt
diff --git a/test/snapshots/seattlerb/expr_not_bang.txt b/test/snapshots/seattlerb/expr_not_bang.txt
diff --git a/test/snapshots/seattlerb/f_kw.txt b/test/snapshots/seattlerb/f_kw.txt
diff --git a/test/snapshots/seattlerb/f_kw__required.txt b/test/snapshots/seattlerb/f_kw__required.txt
diff --git a/test/snapshots/seattlerb/flip2_env_lvar.txt b/test/snapshots/seattlerb/flip2_env_lvar.txt
diff --git a/test/snapshots/seattlerb/float_with_if_modifier.txt b/test/snapshots/seattlerb/float_with_if_modifier.txt
diff --git a/test/snapshots/seattlerb/heredoc__backslash_dos_format.txt b/test/snapshots/seattlerb/heredoc__backslash_dos_format.txt
diff --git a/test/snapshots/seattlerb/heredoc_backslash_nl.txt b/test/snapshots/seattlerb/heredoc_backslash_nl.txt
diff --git a/test/snapshots/seattlerb/heredoc_bad_hex_escape.txt b/test/snapshots/seattlerb/heredoc_bad_hex_escape.txt
diff --git a/test/snapshots/seattlerb/heredoc_bad_oct_escape.txt b/test/snapshots/seattlerb/heredoc_bad_oct_escape.txt
diff --git a/test/snapshots/seattlerb/heredoc_comma_arg.txt b/test/snapshots/seattlerb/heredoc_comma_arg.txt
diff --git a/test/snapshots/seattlerb/heredoc_lineno.txt b/test/snapshots/seattlerb/heredoc_lineno.txt
diff --git a/test/snapshots/seattlerb/heredoc_squiggly.txt b/test/snapshots/seattlerb/heredoc_squiggly.txt
diff --git a/test/snapshots/seattlerb/heredoc_squiggly_blank_line_plus_interpolation.txt b/test/snapshots/seattlerb/heredoc_squiggly_blank_line_plus_interpolation.txt
diff --git a/test/snapshots/seattlerb/heredoc_squiggly_blank_lines.txt b/test/snapshots/seattlerb/heredoc_squiggly_blank_lines.txt
diff --git a/test/snapshots/seattlerb/heredoc_squiggly_empty.txt b/test/snapshots/seattlerb/heredoc_squiggly_empty.txt
diff --git a/test/snapshots/seattlerb/heredoc_squiggly_interp.txt b/test/snapshots/seattlerb/heredoc_squiggly_interp.txt
diff --git a/test/snapshots/seattlerb/heredoc_squiggly_no_indent.txt b/test/snapshots/seattlerb/heredoc_squiggly_no_indent.txt
diff --git a/test/snapshots/seattlerb/heredoc_squiggly_tabs.txt b/test/snapshots/seattlerb/heredoc_squiggly_tabs.txt
diff --git a/test/snapshots/seattlerb/heredoc_squiggly_tabs_extra.txt b/test/snapshots/seattlerb/heredoc_squiggly_tabs_extra.txt
diff --git a/test/snapshots/seattlerb/heredoc_squiggly_visually_blank_lines.txt b/test/snapshots/seattlerb/heredoc_squiggly_visually_blank_lines.txt
diff --git a/test/snapshots/seattlerb/heredoc_trailing_slash_continued_call.txt b/test/snapshots/seattlerb/heredoc_trailing_slash_continued_call.txt
diff --git a/test/snapshots/seattlerb/heredoc_unicode.txt b/test/snapshots/seattlerb/heredoc_unicode.txt
diff --git a/test/snapshots/seattlerb/heredoc_with_carriage_return_escapes.txt b/test/snapshots/seattlerb/heredoc_with_carriage_return_escapes.txt
diff --git a/test/snapshots/seattlerb/heredoc_with_carriage_return_escapes_windows.txt b/test/snapshots/seattlerb/heredoc_with_carriage_return_escapes_windows.txt
diff --git a/test/snapshots/seattlerb/heredoc_with_extra_carriage_horrible_mix.txt b/test/snapshots/seattlerb/heredoc_with_extra_carriage_horrible_mix.txt
diff --git a/test/snapshots/seattlerb/heredoc_with_extra_carriage_returns.txt b/test/snapshots/seattlerb/heredoc_with_extra_carriage_returns.txt
diff --git a/test/snapshots/seattlerb/heredoc_with_extra_carriage_returns_windows.txt b/test/snapshots/seattlerb/heredoc_with_extra_carriage_returns_windows.txt
diff --git a/test/snapshots/seattlerb/heredoc_with_interpolation_and_carriage_return_escapes.txt b/test/snapshots/seattlerb/heredoc_with_interpolation_and_carriage_return_escapes.txt
diff --git a/test/snapshots/seattlerb/heredoc_with_interpolation_and_carriage_return_escapes_windows.txt b/test/snapshots/seattlerb/heredoc_with_interpolation_and_carriage_return_escapes_windows.txt
diff --git a/test/snapshots/seattlerb/heredoc_with_not_global_interpolation.txt b/test/snapshots/seattlerb/heredoc_with_not_global_interpolation.txt