unparser 0.3.0 → 0.4.0

data/lib/unparser/emitter/lambda.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Unparser
+  class Emitter
+    # Emitter for lambda nodes
+    class Lambda < self
+      include Terminated
+
+      handle :lambda
+
+    private
+
+      # Perform dispatch
+      #
+      # @return [undefined]
+      #
+      # @api private
+      #
+      def dispatch
+        write('->')
+      end
+
+    end # Lambda
+  end # Emitter
+end # Unparser

data/lib/unparser/emitter/literal/array.rb

@@ -6,9 +6,6 @@ module Unparser
 
       # Array literal emitter
       class Array < self
-        OPEN  = '['.freeze
-        CLOSE = ']'.freeze
-
         handle :array
 
       private
@@ -20,7 +17,7 @@ module Unparser
         # @api private
         #
         def dispatch
-          parentheses(OPEN, CLOSE) do
+          parentheses(*BRACKETS_SQUARE) do
             delimited(children)
           end
         end

data/lib/unparser/emitter/meta.rb

@@ -6,10 +6,10 @@ module Unparser
     class Meta < self
       include Terminated
 
-      handle(:__FILE__, :__LINE__)
+      handle(:__ENCODING__, :__FILE__, :__LINE__)
 
       def dispatch
-        write(node.type.to_s) # (e.g. literally write '__FILE__' or '__LINE__')
+        write(node.type.to_s)
       end
     end # Meta
   end # Emitter

data/lib/unparser/emitter/rescue.rb

@@ -12,7 +12,7 @@ module Unparser
 
       define_group :rescue_bodies, 1..-2
 
-      EMBEDDED_TYPES = %i[def defs kwbegin ensure].to_set.freeze
+      EMBEDDED_TYPES = %i[block def defs kwbegin ensure].to_set.freeze
 
       NOINDENT_STANDALONE_RESCUE = %i[root begin pair_rocket pair_colon lvasgn ivasgn].to_set.freeze
 

data/lib/unparser/emitter/send.rb

@@ -8,12 +8,10 @@ module Unparser
 
       handle :send
 
-      INDEX_PARENS  = IceNine.deep_freeze(%w([ ]))
-      NORMAL_PARENS = IceNine.deep_freeze(%w[( )])
-
-      INDEX_REFERENCE = :'[]'
-      INDEX_ASSIGN    = :'[]='
-      ASSIGN_SUFFIX   = '='.freeze
+      ASSIGN_SUFFIX    = '='.freeze
+      INDEX_ASSIGN     = :'[]='
+      INDEX_REFERENCE  = :'[]'
+      NON_ASSIGN_RANGE = (0..-2).freeze
 
       children :receiver, :selector
 
@@ -50,23 +48,6 @@ module Unparser
       # @api private
       #
       def effective_emitter_class
-        case selector
-        when INDEX_REFERENCE
-          Index::Reference
-        when INDEX_ASSIGN
-          Index::Assign
-        else
-          non_index_emitter
-        end
-      end
-
-      # Return non index emitter
-      #
-      # @return [Class:Emitter]
-      #
-      # @api private
-      #
-      def non_index_emitter
         if binary_operator?
           Binary
         elsif unary_operator?
@@ -115,11 +96,7 @@ module Unparser
       # @api private
       #
       def emit_selector
-        name = string_selector
-        if mlhs?
-          name = name[0..-2]
-        end
-        write(name)
+        write(mlhs? ? non_assignment_selector : string_selector)
       end
 
       # Test for mlhs
@@ -199,6 +176,15 @@ module Unparser
         local_variable_scope.local_variable_defined_for_node?(node, selector)
       end
 
+      # The non assignment selector
+      #
+      # @return [String]
+      #
+      # @api private
+      def non_assignment_selector
+        string_selector[NON_ASSIGN_RANGE]
+      end
+
     end # Send
   end # Emitter
 end # Unparser

data/lib/unparser/emitter/send/attribute_assignment.rb

@@ -7,6 +7,8 @@ module Unparser
       class AttributeAssignment < self
         include Unterminated
 
+        children :receiver, :selector, :first_argument
+
         # Perform regular dispatch
         #
         # @return [undefined]
@@ -16,8 +18,13 @@ module Unparser
         def dispatch
           emit_receiver
           emit_attribute
-          emit_operator
-          visit(arguments.first)
+          write(T_ASN)
+
+          if arguments.one?
+            visit(first_argument)
+          else
+            parentheses { delimited(arguments) }
+          end
         end
 
       private
@@ -40,29 +47,8 @@ module Unparser
         # @api private
         #
         def emit_attribute
-          write(attribute_name)
-        end
-
-        # Emit assignment operator
-        #
-        # @return [undefined]
-        #
-        # @api private
-        #
-        def emit_operator
-          write(WS, T_ASN, WS)
-        end
-
-        # Return attribute name
-        #
-        # @return [String]
-        #
-        # @api private
-        #
-        def attribute_name
-          string_selector[0..-2]
+          write(non_assignment_selector)
         end
-
       end # AttributeAssignment
     end # Send
   end # Emitter

data/spec/spec_helper.rb

@@ -6,22 +6,11 @@ require 'morpher'
 require 'devtools/spec_helper'
 
 require 'parser/current'
-require 'parser/ruby19'
-require 'parser/ruby20'
-require 'parser/ruby21'
-require 'parser/ruby22'
 
 module SpecHelper
   def s(type, *children)
     Parser::AST::Node.new(type, children)
   end
-
-  def strip(source)
-    source = source.rstrip
-    indent = source.scan(/^\s*/).min_by(&:length)
-    source.gsub(/^#{indent}/, '')
-  end
-
 end
 
 RSpec.configure do |config|

data/spec/unit/unparser/comments/consume_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Unparser::Comments, '#consume' do
 
   let(:ast_and_comments) do
-    Parser::CurrentRuby.parse_with_comments(<<-RUBY)
+    Unparser.parse_with_comments(<<~'RUBY')
       def hi # EOL 1
       end # EOL 2
     RUBY

data/spec/unit/unparser/comments/take_all_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Unparser::Comments, '#take_all' do
 
   let(:ast_and_comments) do
-    Parser::CurrentRuby.parse_with_comments(<<-RUBY)
+    Unparser.parse_with_comments(<<~'RUBY')
       def hi # EOL 1
       end # EOL 2
     RUBY

data/spec/unit/unparser/comments/take_before_spec.rb

@@ -9,7 +9,7 @@ describe Unparser::Comments, '#take_before' do
   context 'usual case' do
 
     let(:ast_and_comments) do
-      Parser::CurrentRuby.parse_with_comments(<<-RUBY)
+      Unparser.parse_with_comments(<<~'RUBY')
         def hi # EOL 1
           # comment
         end # EOL 2
@@ -29,7 +29,7 @@ describe Unparser::Comments, '#take_before' do
   context 'when node does not respond to source part' do
 
     let(:ast_and_comments) do
-      Parser::CurrentRuby.parse_with_comments(<<-RUBY)
+      Unparser.parse_with_comments(<<~'RUBY')
         expression ? :foo : :bar # EOL 1
         # EOL 2
       RUBY

data/spec/unit/unparser/comments/take_eol_comments_spec.rb

@@ -3,12 +3,12 @@ require 'spec_helper'
 describe Unparser::Comments, '#take_eol_comments' do
 
   let(:ast_and_comments) do
-    Parser::CurrentRuby.parse_with_comments(<<-RUBY)
-def hi # EOL 1
-=begin
-doc comment
-=end
-end # EOL 2
+    Unparser.parse_with_comments(<<~'RUBY')
+      def hi # EOL 1
+      =begin
+      doc comment
+      =end
+      end # EOL 2
     RUBY
   end
   let(:ast)              { ast_and_comments[0] }

data/spec/unit/unparser_spec.rb

@@ -1,95 +1,114 @@
 require 'spec_helper'
-require 'parser/all'
-require 'support/parser_class_generator'
 
 describe Unparser, mutant_expression: 'Unparser::Emitter*' do
-  describe '.unparse' do
-
-    RUBY_VERSION_PARSERS = IceNine.deep_freeze(
-      '2.5' => Parser::Ruby25
-    )
+  describe '.buffer' do
+    let(:source) { 'a + b' }
 
-    RUBY_VERSIONS = RUBY_VERSION_PARSERS.keys.freeze
-
-    def self.builder_options
-      @builder_options ||= {}
+    def apply
+      described_class.buffer(source)
     end
 
-    def self.builder_options=(options)
-      @builder_options = options
+    it 'returns parser buffer with expected name' do
+      expect(apply.name).to eql('(string)')
     end
 
-    def self.ruby_versions
-      @ruby_versions ||= RUBY_VERSIONS
+    it 'returns parser buffer with pre-filled source' do
+      expect(apply.source).to eql(source)
     end
+  end
 
-    def self.ruby_versions=(versions)
-      @ruby_versions = versions
+  describe '.parser' do
+    let(:invalid_source_buffer) { Unparser.buffer('a +') }
+
+    def apply
+      described_class.parser
     end
 
-    def self.with_ruby_versions(beginning_at: nil, ending_at: nil, only: nil)
-      original_ruby_versions = ruby_versions
-      if only
-        self.ruby_versions = only & ruby_versions # intersection
-      else
-        if ending_at
-          idx = ruby_versions.index(ending_at) || fail('Invalid Ruby specified')
-          self.ruby_versions = ruby_versions[0..idx]
-        end
-        if beginning_at
-          idx = ruby_versions.index(beginning_at) || fail('Invalid Ruby specified')
-          self.ruby_versions = ruby_versions[idx..-1]
+    context 'failure' do
+      def apply
+        super.tap do |parser|
+          parser.diagnostics.consumer = ->(_) {}
         end
       end
 
-      yield
+      it 'returns a parser that fails with syntax error' do
+        expect { apply.parse(invalid_source_buffer) }
+          .to raise_error(Parser::SyntaxError)
+      end
+    end
+
+    context 'warnings' do
+      before do
+        allow(Kernel).to receive(:warn)
+      end
+
+      it 'returns a parser that warns on diagnostics' do
+        expect { apply.parse(invalid_source_buffer) }
+          .to raise_error(Parser::SyntaxError)
+
+        expect(Kernel).to have_received(:warn)
+          .with([
+            "(string):1:4: error: unexpected token $end",
+            "(string):1: a +", "(string):1:    "
+          ])
+      end
+    end
+  end
+
+  describe '.parse' do
+    def apply
+      described_class.parse('self[1]=2')
+    end
 
-      self.ruby_versions = original_ruby_versions
+    it 'returns expected AST' do
+      expect(apply).to eql(s(:indexasgn, s(:self), s(:int, 1), s(:int, 2)))
     end
+  end
 
-    def self.current_parsers
-      ruby_versions.map do |ruby_version|
-        if builder_options != {}
-          ParserClassGenerator.generate_with_options(parser_for_ruby_version(ruby_version), builder_options)
-        else
-          parser_for_ruby_version(ruby_version)
+  describe '.unparse' do
+    let(:builder_options) { {} }
+
+    def parser
+      Unparser.parser.tap do |parser|
+        builder_options.each do |name, value|
+          parser.builder.public_send(:"#{name}=", value)
         end
       end
     end
 
-    def self.with_builder_options(options)
-      original_options = builder_options
-      self.builder_options = builder_options.merge(options)
-
-      yield
+    def buffer(input)
+      Unparser.buffer(input)
+    end
 
-      self.builder_options = original_options
+    def parse_with_comments(string)
+      parser.parse_with_comments(buffer(string))
     end
 
-    def self.parser_for_ruby_version(version)
-      RUBY_VERSION_PARSERS.fetch(version) do
-        raise "Unrecognized Ruby version #{version}"
+    def self.with_builder_options(options, &block)
+      context "with #{options}" do
+        let(:builder_options) { options }
+
+        class_eval(&block)
       end
     end
 
-    def assert_round_trip(input, parser)
-      ast, comments = parser.parse_with_comments(input)
+    def assert_round_trip(string, parser)
+      ast, comments = parse_with_comments(string)
       generated = Unparser.unparse(ast, comments)
-      expect(generated).to eql(input)
-      generated_ast, _comments = parser.parse_with_comments(generated)
+      expect(generated).to eql(string.chomp)
+      generated_ast, _comments = parse_with_comments(generated)
       expect(ast == generated_ast).to be(true)
     end
 
     def assert_generates_from_string(parser, string, expected)
-      string = strip(string)
-      ast_with_comments = parser.parse_with_comments(string)
-      assert_generates_from_ast(parser, ast_with_comments, expected)
+      ast_with_comments = parse_with_comments(string)
+      assert_generates_from_ast(parser, ast_with_comments, expected.chomp)
     end
 
     def assert_generates_from_ast(parser, ast_with_comments, expected)
       generated = Unparser.unparse(*ast_with_comments)
       expect(generated).to eql(expected)
-      ast, comments = parser.parse_with_comments(generated)
+      ast, comments = parse_with_comments(generated)
       expect(Unparser.unparse(ast, comments)).to eql(expected)
     end
 
@@ -104,42 +123,37 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
       assert_source("#{expression}.foo")
     end
 
-    def self.assert_generates(ast_or_string, expected)
-      current_parsers.each do |parser|
-        it "should generate #{ast_or_string} as #{expected} under #{parser.inspect}" do
-          if ast_or_string.is_a?(String)
-            expected = strip(expected)
-            assert_generates_from_string(parser, ast_or_string, expected)
-          else
-            assert_generates_from_ast(parser, [ast_or_string, []], expected)
-          end
+    def self.assert_generates(input, expected)
+      it "should generate #{input} as #{expected}" do
+        if input.is_a?(String)
+          assert_generates_from_string(parser, input, expected)
+        else
+          assert_generates_from_ast(parser, [input, []], expected)
         end
       end
     end
 
     def self.assert_round_trip(input)
-      current_parsers.each do |parser|
-        it "should round trip #{input} under #{parser.inspect}" do
-          assert_round_trip(input, parser)
-        end
+      it "should round trip #{input}" do
+        assert_round_trip(input, parser)
       end
     end
 
     def self.assert_source(input)
-      assert_round_trip(strip(input))
+      assert_round_trip(input)
     end
 
     context 'kwargs' do
-      assert_source <<-RUBY
+      assert_source <<~RUBY
         def foo(bar:, baz:)
         end
       RUBY
 
-      assert_source <<-RUBY
+      assert_source <<~RUBY
         foo(**bar)
       RUBY
 
-      assert_source <<-RUBY
+      assert_source <<~RUBY
         def foo(bar:, baz: "value")
         end
       RUBY
@@ -193,7 +207,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         assert_terminated '"foo bar"'
         assert_terminated '"foo\nbar"'
         # Within indentation
-        assert_generates <<-'RUBY', <<-'RUBY'
+        assert_generates <<~'RUBY', <<~'RUBY'
           if foo
             "
             #{foo}
@@ -233,7 +247,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         assert_terminated '/\n/'
         assert_terminated "/\n/x"
         # Within indentation
-        assert_source <<-RUBY
+        assert_source <<~RUBY
           if foo
             /
             /
@@ -320,7 +334,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
     end
 
     context 'magic keywords' do
-      assert_generates '__ENCODING__', 'Encoding::UTF_8'
+      assert_source '__ENCODING__'
 
       # These two assertions don't actually need to be wrapped in this block since `true` is the default,
       # but it is helpful to contrast with the assertions farther down.
@@ -353,7 +367,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
       context 'lvar introduction from condition' do
         assert_source 'foo = bar while foo'
         assert_source 'foo = bar until foo'
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           foo = exp
           while foo
             foo = bar
@@ -366,7 +380,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         #   pair = :foo
         #   foo
         # end
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           if foo do |pair|
             pair
           end
@@ -375,13 +389,13 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           while foo
             foo = bar
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           each do |bar|
             while foo
               foo = bar
@@ -389,13 +403,13 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def foo
             foo = bar while foo != baz
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           each do |baz|
             while foo
               foo = bar
@@ -403,7 +417,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           each do |foo|
             while foo
               foo = bar
@@ -441,7 +455,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         assert_unterminated "#{keyword} *nil"
         assert_unterminated "#{keyword} *foo, bar"
 
-        assert_generates <<-RUBY, <<-RUBY
+        assert_generates <<~RUBY, <<~RUBY
           foo do |bar|
             bar =~ // || #{keyword}
             baz
@@ -453,7 +467,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
           end
         RUBY
 
-        assert_generates <<-RUBY, <<-RUBY
+        assert_generates <<~RUBY, <<~RUBY
           #{keyword}(a ? b : c)
         RUBY
           #{keyword} (if a
@@ -484,91 +498,101 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
       assert_terminated 'foo(&(foo || bar))'
       assert_terminated 'foo(*arguments)'
       assert_terminated 'foo(*arguments)'
-      assert_source <<-'RUBY'
+
+      assert_source <<~'RUBY'
         foo do
         end
       RUBY
 
-      assert_source <<-'RUBY'
-        foo(1) do
-          nil
+      assert_source <<~'RUBY'
+        foo do |a|
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
+        foo do |a, |
+        end
+      RUBY
+
+      assert_source <<~'RUBY'
         foo do |a, b|
+        end
+      RUBY
+
+      assert_source <<~'RUBY'
+        foo(1) do
           nil
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         foo do |a, *b|
           nil
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         foo do |a, *|
           nil
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         foo do
           bar
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         foo.bar(*args)
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         foo.bar do |(a)|
           d
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         foo.bar do |(a, b), c|
           d
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         foo.bar do |*a; b|
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         foo.bar do |a; b|
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         foo.bar do |; a, b|
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         foo.bar do |((*))|
           d
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         foo.bar do |(a, (*))|
           d
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         foo.bar do |(a, b)|
           d
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         foo.bar do
         end.baz
       RUBY
@@ -578,17 +602,17 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
       assert_unterminated 'a || return'
       assert_unterminated 'foo << (bar * baz)'
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         foo ||= (a, _ = b)
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         begin
         rescue
         end.bar
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         case (def foo
         end
         :bar)
@@ -596,58 +620,58 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         end.baz
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         case foo
         when bar
         end.baz
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         class << self
         end.bar
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         def self.foo
         end.bar
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         def foo
         end.bar
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         until foo
         end.bar
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         while foo
         end.bar
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         loop do
         end.bar
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         class Foo
         end.bar
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         module Foo
         end.bar
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         if foo
         end.baz
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         local = 1
         local.bar
       RUBY
@@ -657,15 +681,16 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
       assert_terminated 'foo.bar(*args, foo)'
       assert_terminated 'foo.bar(foo, *args)'
       assert_terminated 'foo.bar(foo, *args, &block)'
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         foo(bar, *args)
       RUBY
 
       assert_terminated 'foo(*args, &block)'
       assert_terminated 'foo.bar(&baz)'
       assert_terminated 'foo.bar(:baz, &baz)'
-      assert_terminated 'foo.bar = :baz'
-      assert_unterminated 'self.foo = :bar'
+      assert_terminated 'foo.bar=:baz'
+
+      assert_unterminated 'self.foo=:bar'
 
       assert_terminated 'foo.bar(baz: boz)'
       assert_terminated 'foo.bar(foo, "baz" => boz)'
@@ -676,17 +701,17 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
     context 'begin; end' do
       assert_generates s(:begin), ''
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         begin
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         foo
         bar
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         begin
           foo
           bar
@@ -695,7 +720,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
     end
 
     context 'begin / rescue / ensure' do
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         begin
           foo
         ensure
@@ -704,7 +729,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         begin
           foo
         rescue
@@ -712,7 +737,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         begin
           begin
             foo
@@ -725,14 +750,14 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         begin
           raise(Exception) rescue foo = bar
         rescue Exception
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         begin
           foo
           bar
@@ -742,7 +767,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         begin
           foo
         rescue Exception
@@ -750,7 +775,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         begin
           foo
         rescue => bar
@@ -758,7 +783,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         begin
           foo
         rescue Exception, Other => bar
@@ -766,44 +791,44 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         class << self
           undef :bar rescue nil
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         module Foo
           undef :bar rescue nil
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         class Foo
           undef :bar rescue nil
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         begin
         rescue Exception => e
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         begin
         ensure
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         begin
         rescue
         ensure
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         begin
           foo
         rescue Exception => bar
@@ -811,7 +836,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         begin
           bar
         rescue SomeError, *bar
@@ -819,7 +844,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         begin
           bar
         rescue SomeError, *bar => exception
@@ -827,7 +852,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         begin
           bar
         rescue *bar
@@ -835,14 +860,14 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         begin
           bar
         rescue LoadError
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         begin
           bar
         rescue
@@ -851,7 +876,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         begin
           bar
         rescue *bar => exception
@@ -859,19 +884,94 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         end
       RUBY
 
+      assert_source <<~'RUBY'
+        m do
+        rescue Exception => e
+        end
+      RUBY
+
+      assert_source <<~'RUBY'
+        m do
+        ensure
+        end
+      RUBY
+
+      assert_source <<~'RUBY'
+        m do
+        rescue
+        ensure
+        end
+      RUBY
+
+      assert_source <<~'RUBY'
+        m do
+          foo
+        rescue Exception => bar
+          bar
+        end
+      RUBY
+
+      assert_source <<~'RUBY'
+        m do
+          bar
+        rescue SomeError, *bar
+          baz
+        end
+      RUBY
+
+      assert_source <<~'RUBY'
+        m do
+          bar
+        rescue SomeError, *bar => exception
+          baz
+        end
+      RUBY
+
+      assert_source <<~'RUBY'
+        m do
+          bar
+        rescue *bar
+          baz
+        end
+      RUBY
+
+      assert_source <<~'RUBY'
+        m do
+          bar
+        rescue LoadError
+        end
+      RUBY
+
+      assert_source <<~'RUBY'
+        m do
+          bar
+        rescue
+        else
+          baz
+        end
+      RUBY
+
+      assert_source <<~'RUBY'
+        m do
+          bar
+        rescue *bar => exception
+          baz
+        end
+      RUBY
+
       assert_source 'foo rescue bar'
       assert_source 'foo rescue return bar'
       assert_source 'x = (foo rescue return bar)'
 
       %w(while until if).each do |keyword|
-        assert_source <<-RUBY
+        assert_source <<~RUBY
           #{keyword} (
             foo rescue false
           )
           end
         RUBY
 
-        assert_generates <<-RUBY, <<-GENERATED
+        assert_generates <<~RUBY, <<~GENERATED
           foo rescue false #{keyword} true
         RUBY
           #{keyword} true
@@ -880,7 +980,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         GENERATED
       end
 
-      assert_generates <<-'RUBY', <<-GENERATED
+      assert_generates <<~'RUBY', <<~GENERATED
         case (foo rescue false)
         when true
         end
@@ -902,31 +1002,31 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
       assert_source 'super(&block)'
       assert_source 'super(a, &block)'
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         super(a do
           foo
         end)
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         super do
           foo
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         super(a) do
           foo
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         super() do
           foo
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         super(a, b) do
           foo
         end
@@ -940,7 +1040,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
     end
 
     context 'BEGIN' do
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         BEGIN {
           foo
         }
@@ -948,7 +1048,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
     end
 
     context 'END' do
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         END {
           foo
         }
@@ -956,11 +1056,11 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
     end
 
     context 'alias' do
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         alias $foo $bar
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         alias :foo :bar
       RUBY
     end
@@ -980,19 +1080,19 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
     end
 
     context 'if statement' do
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         if /foo/
           bar
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         if 3
           9
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         if 4
           5
         else
@@ -1000,32 +1100,32 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         unless 3
           nil
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         unless 3
           9
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         if foo
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         foo = bar if foo
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         foo = bar unless foo
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         def foo(*foo)
           unless foo
             foo = bar
@@ -1033,7 +1133,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         each do |foo|
           unless foo
             foo = bar
@@ -1045,18 +1145,18 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
     context 'def' do
       context 'on instance' do
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def foo
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def foo
             bar
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def foo
             foo
           rescue
@@ -1066,7 +1166,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           begin
             foo
           ensure
@@ -1074,7 +1174,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def foo
             bar
           ensure
@@ -1082,7 +1182,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def self.foo
             bar
           rescue
@@ -1090,7 +1190,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def foo
             bar
           rescue
@@ -1098,134 +1198,134 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def foo(bar)
             bar
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def foo(bar, baz)
             bar
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def foo(bar = ())
             bar
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def foo(bar = (baz
           nil))
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def foo(bar = true)
             bar
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def foo(bar, baz = true)
             bar
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def foo(bar: 1)
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def foo(*)
             bar
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def foo(*bar)
             bar
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def foo(bar, *baz)
             bar
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def foo(baz = true, *bor)
             bar
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def foo(baz = true, *bor, &block)
             bar
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def foo(bar, baz = true, *bor)
             bar
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def foo(&block)
             bar
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def foo(bar, &block)
             bar
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def foo
             bar
             baz
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def (foo do |bar|
           end).bar
             bar
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def (foo(1)).bar
             bar
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def (Foo::Bar.baz).bar
             baz
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def (Foo::Bar).bar
             baz
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def Foo.bar
             baz
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def foo.bar
             baz
           end
@@ -1233,25 +1333,25 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
       end
 
       context 'on singleton' do
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def self.foo
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def self.foo
             bar
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def self.foo
             bar
             baz
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           def Foo.bar
             bar
           end
@@ -1260,43 +1360,43 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
       end
 
       context 'class' do
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           class TestClass
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           class << some_object
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           class << some_object
             the_body
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           class SomeNameSpace::TestClass
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           class Some::Name::Space::TestClass
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           class TestClass < Object
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           class TestClass < SomeNameSpace::Object
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           class TestClass
             def foo
               :bar
@@ -1304,7 +1404,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           class ::TestClass
           end
         RUBY
@@ -1312,22 +1412,22 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
 
       context 'module' do
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           module TestModule
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           module SomeNameSpace::TestModule
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           module Some::Name::Space::TestModule
           end
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           module TestModule
             def foo
               :bar
@@ -1351,7 +1451,10 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         assert_source 'foo[a, b] = value'
         assert_source 'foo[1..2] = value'
         assert_source 'foo.[]=()'
+        assert_source 'foo.[]=true'
+        assert_source 'foo.[]=(1, 2)'
         assert_source 'foo[] = 1'
+        assert_unterminated 'foo[] = 1'
 
         %w(+ - * / % & | || &&).each do |operator|
           context "with #{operator}" do
@@ -1362,31 +1465,46 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
       end
 
       context 'defined?' do
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           defined?(@foo)
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           defined?(Foo)
         RUBY
 
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           defined?((a, b = [1, 2]))
         RUBY
       end
     end
 
     context 'lambda' do
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         lambda do
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         lambda do |a, b|
           a
         end
       RUBY
+
+      assert_source <<~'RUBY'
+        ->() do
+        end
+      RUBY
+
+      assert_source <<~'RUBY'
+        ->(a) do
+        end
+      RUBY
+
+      assert_source <<~'RUBY'
+        ->(a, b) do
+        end
+      RUBY
     end
 
     context 'match operators' do
@@ -1450,7 +1568,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
 
     context 'flip flops' do
       context 'inclusive' do
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           if ((i == 4)..(i == 4))
             foo
           end
@@ -1458,7 +1576,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
       end
 
       context 'exclusive' do
-        assert_source <<-'RUBY'
+        assert_source <<~'RUBY'
           if ((i == 4)...(i == 4))
             foo
           end
@@ -1467,7 +1585,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
     end
 
     context 'case statement' do
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         case
         when bar
           baz
@@ -1476,7 +1594,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         case foo
         when bar
         when baz
@@ -1484,7 +1602,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         case foo
         when bar
           baz
@@ -1493,21 +1611,21 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         case foo
         when bar, baz
           :other
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         case foo
         when *bar
           :value
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         case foo
         when bar
           baz
@@ -1518,24 +1636,24 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
     end
 
     context 'for' do
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         bar(for a in bar do
           baz
         end)
       RUBY
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         for a in bar do
           baz
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         for a, *b in bar do
           baz
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         for a, b in bar do
           baz
         end
@@ -1554,7 +1672,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
     end
 
     context 'loop' do
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         loop do
           foo
         end
@@ -1562,26 +1680,26 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
     end
 
     context 'post conditions' do
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         x = (begin
           foo
         end while baz)
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         begin
           foo
         end while baz
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         begin
           foo
           bar
         end until baz
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         begin
           foo
           bar
@@ -1590,18 +1708,18 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
     end
 
     context 'while' do
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         while false
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         while false
           3
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         while (foo do
         end)
           :body
@@ -1610,18 +1728,18 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
     end
 
     context 'until' do
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         until false
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         until false
           3
         end
       RUBY
 
-      assert_source <<-'RUBY'
+      assert_source <<~'RUBY'
         until (foo do
         end)
           :body
@@ -1629,16 +1747,16 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
       RUBY
     end
 
-    assert_source <<-'RUBY'
+    assert_source <<~'RUBY'
       # comment before
       a_line_of_code
     RUBY
 
-    assert_source <<-'RUBY'
+    assert_source <<~'RUBY'
       a_line_of_code # comment after
     RUBY
 
-    assert_source <<-'RUBY'
+    assert_source <<~'RUBY'
       nested do # first
         # second
         something # comment
@@ -1647,7 +1765,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
       # last
     RUBY
 
-    assert_generates <<-'RUBY', <<-'RUBY'
+    assert_generates <<~'RUBY', <<~'RUBY'
       foo if bar
       # comment
     RUBY
@@ -1657,13 +1775,13 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
       # comment
     RUBY
 
-    assert_source <<-'RUBY'
+    assert_source <<~'RUBY'
       def noop
         # do nothing
       end
     RUBY
 
-    assert_source <<-'RUBY'
+    assert_source <<~'RUBY'
       =begin
         block comment
       =end
@@ -1678,14 +1796,14 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
       end
     RUBY
 
-    assert_generates(<<-'RUBY', <<-'RUBY')
+    assert_generates(<<~'RUBY', <<~'RUBY')
       1 + # first
         2 # second
     RUBY
       1 + 2 # first # second
     RUBY
 
-    assert_generates(<<-'RUBY', <<-'RUBY')
+    assert_generates(<<~'RUBY', <<~'RUBY')
       1 +
         # first
         2 # second
@@ -1693,7 +1811,7 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
       1 + 2 # first # second
     RUBY
 
-    assert_generates(<<-'RUBY', <<-'RUBY')
+    assert_generates(<<~'RUBY', <<~'RUBY')
       1 +
       =begin
         block comment
@@ -1705,6 +1823,5 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         block comment
       =end
     RUBY
-
   end
 end