Merge pull request #411 from viralpraxis/adopt-prism-v1.5-release

Adopt Prism v1.5 release

Author: mbj

Gemfile.lock

@@ -4,7 +4,7 @@ PATH
     unparser (0.8.0)
       diff-lcs (~> 1.6)
       parser (>= 3.3.0)
-      prism (>= 1.4)
+      prism (>= 1.5.1)
 
 GEM
   remote: https://rubygems.org/
@@ -38,7 +38,7 @@ GEM
     pp (0.6.2)
       prettyprint
     prettyprint (0.2.0)
-    prism (1.4.0)
+    prism (1.5.1)
     psych (5.2.6)
       date
       stringio
@@ -104,4 +104,4 @@ DEPENDENCIES
   unparser!
 
 BUNDLED WITH
-   2.6.2
+   2.7.0

bin/parser-prism-round-trip-test

@@ -62,7 +62,9 @@ b\nar
         spanning_heredoc
         heredocs_with_fake_newlines
         heredocs_nested
-      ].to_set { |file| "#{PARSER_PATH}/test/prism/fixtures-tmp/#{file}.txt" }
+      ].tap { _1 << 'endless_methods_command_call' unless Gem::Version.new(RUBY_VERSION) >= '3.5' } # https://github.com/ruby/prism/pull/3639
+       .tap { _1 << 'leading_logical' unless Gem::Version.new(RUBY_VERSION) >= '3.5' } # https://github.com/ruby/prism/pull/3337
+       .to_set { |file| "#{PARSER_PATH}/test/prism/fixtures-tmp/#{file}.txt" }
     end
 
     private

lib/unparser/emitter/block.rb

@@ -51,7 +51,7 @@ def emit_target
           emit_send_target
         when :lambda
           visit(target)
-          emit_lambda_arguments unless node.type.equal?(:numblock)
+          emit_lambda_arguments
         else
           visit(target)
         end
@@ -63,7 +63,11 @@ def emit_send_target
         target_writer.emit_arguments_without_heredoc_body
       end
 
+      # NOTE: mutant fails on Ruby < 3.4
+      # mutant:disable
       def emit_lambda_arguments
+        return if node.type.equal?(:numblock) || itblock?
+
         parentheses { writer_with(Args, node: arguments).emit_lambda_arguments }
       end
 

test/corpus/literal/before/34.rb

@@ -16,10 +16,6 @@
 break or b
 next or b
 return or a
-
-begin
-rescue => A[]
-end
 for foo[] in m do
 end
 for (a, b) in bar do

test/corpus/literal/rescue.rb

@@ -8,3 +8,7 @@
 (foo = []) rescue nil
 (foo = 1) rescue nil
 (foo = [1]) rescue nil
+
+begin
+rescue => A[]
+end

test/corpus/semantic/itblock.rb

@@ -1 +1,3 @@
 x { it }
+
+-> { it }

unparser.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency('diff-lcs', '~> 1.6')
   gem.add_dependency('parser',   '>= 3.3.0')
-  gem.add_dependency('prism',    '>= 1.4')
+  gem.add_dependency('prism',    '>= 1.5.1')
 
   gem.add_development_dependency('mutant',            '~> 0.13.2')
   gem.add_development_dependency('mutant-rspec',      '~> 0.13.0')