Update to latest seattlerb

Author: kddnewton

rakelib/seattlerb.rake

@@ -1,16 +1,5 @@
 # frozen_string_literal: true
 
-# These files are not valid Ruby
-known_failures = %w(
-  test/fixtures/seattlerb/begin_else_return_value.txt
-  test/fixtures/seattlerb/block_yield.txt
-  test/fixtures/seattlerb/bug_begin_else.txt
-  test/fixtures/seattlerb/bug170.txt
-  test/fixtures/seattlerb/call_block_arg_unnamed.txt
-  test/fixtures/seattlerb/iter_array_curly.txt
-  test/fixtures/seattlerb/magic_encoding_comment__bad.txt
-)
-
 namespace :seattlerb do
   desc "Ensure there's a local copy of seattlerb/ruby_parser"
   file "tmp/seattlerb" do
@@ -24,6 +13,35 @@ namespace :seattlerb do
 
   desc "Import the seattlerb tests"
   task import: ["tmp/seattlerb", "test/fixtures/seattlerb"] do
+    require "base64"
+
+    # These files are not valid Ruby
+    known_failures = %w[
+      test/fixtures/seattlerb/args_dstar__anon_solo.txt
+      test/fixtures/seattlerb/args_dstar__anon_trailing.txt
+      test/fixtures/seattlerb/args_star__anon_solo.txt
+      test/fixtures/seattlerb/args_star__anon_trailing.txt
+      test/fixtures/seattlerb/begin_else_return_value.txt
+      test/fixtures/seattlerb/block_yield.txt
+      test/fixtures/seattlerb/bug_begin_else.txt
+      test/fixtures/seattlerb/bug170.txt
+      test/fixtures/seattlerb/call_block_arg_unnamed.txt
+      test/fixtures/seattlerb/iter_array_curly.txt
+      test/fixtures/seattlerb/magic_encoding_comment__bad.txt
+    ]
+
+    # Cleaning up some file names
+    renames = [
+      "aGVyZWRvY193dGZfSV9oYXRlX3lvdQ==\n",
+      "aV9mdWNraW5nX2hhdGVf\n",
+      "aV9oYXZlX25vX2ZyZWFraW5fY2x1ZQ==\n",
+      "a2lsbF9tZQ==\n",
+      "bW90aGVyZnVja2lu\n",
+      "d3RmX2lfaGF0ZV95b3U=\n",
+      "d3Rm\n",
+      "em9tZ19zb21ldGltZXNfaV9oYXRlX3RoaXNfcHJvamVjdA==\n"
+    ].map { Base64.decode64(_1) }
+
     # The license is in the README
     cp "tmp/seattlerb/README.rdoc", "test/fixtures/seattlerb/README.rdoc"
 
@@ -36,7 +54,7 @@ namespace :seattlerb do
 
       def assert_parse(source, _)
         entry = caller.find { _1.include?("test_ruby_parser.rb") }
-        name = entry[/\d+:in `(?:block in )?(?:assert_|test_)?(.+)'/, 1]
+        name = entry[/\d+:in `(?:block (?:\(\d+ levels\) )?in )?(?:assert_|test_|<module:)?(.+?)\>?'/, 1]
 
         COLLECTED[name] << source
         super
@@ -46,7 +64,17 @@ namespace :seattlerb do
     RubyParserTestCase.prepend(Hook)
     Minitest.after_run do
       Hook::COLLECTED.each do |(name, codes)|
-        filepath = "test/fixtures/seattlerb/#{name.delete!('?')}.txt"
+        name = name.delete("?")
+
+        # Clean up the names a bit
+        renames.each_with_index do |rename, index|
+          if name.start_with?(rename)
+            name = "difficult#{index}_#{name.delete_prefix(rename)}"
+            break
+          end
+        end
+
+        filepath = "test/fixtures/seattlerb/#{name}.txt"
         File.write(filepath, "#{codes.uniq.sort.join("\n\n")}\n")
       end
 

test/fixtures/seattlerb/TestRubyParserShared.txt

@@ -0,0 +1,92 @@
+%I[
+
+
+]
+
+%I[
+line2
+line3
+]
+
+%W[
+
+
+]
+
+%W[
+line2
+line3
+]
+
+%i[
+
+
+]
+
+%i[
+line2
+line3
+]
+
+%r[
+
+
+]
+
+%w[
+
+
+]
+
+%w[
+line2
+line3
+]
+
+[
+:line2,
+:line3
+]
+
+class X         # line 1
+  def self.y(a, # line 2
+        b)      # line 3
+    a + b       # line 4
+  end           # line 5
+end             # line 6
+
+
+class X    # line 1
+  class Y  # line 2
+    Z = 42 # line 3
+  end      # line 4
+end        # line 5
+
+
+class X    # line 1
+  def y(a, # line 2
+        b) # line 3
+    a + b  # line 4
+  end      # line 5
+end        # line 6
+
+
+module X
+  X = [
+    :line3,
+    :line4,
+  ]
+end
+
+
+module X   # line 1
+  module Y # line 2
+    Z = 42 # line 3
+  end      # line 4
+end        # line 5
+
+
+x(
+:line2,
+:line3
+)

test/fixtures/seattlerb/case_in.txt

@@ -1,5 +1,5 @@
 case :a
-in  "b":
+in  "b": 
 end
 
 case :a

test/fixtures/seattlerb/defn_forward_args__no_parens.txt

@@ -0,0 +1,3 @@
+def f ...
+  m(...)
+end

test/fixtures/seattlerb/heredoc_wtf_I_hate_you.txt renamed to test/fixtures/seattlerb/difficult0_.txt

@@ -1,5 +1,5 @@
 if true then
-  p('a')
+  p("a")
   b = 1
   p b
   c =1