unparser 0.6.15 → 0.8.0

data/lib/unparser/emitter/dstr.rb

@@ -7,15 +7,16 @@ module Unparser
 
       handle :dstr
 
-      def emit_heredoc_reminders
-        writer_with(Writer::DynamicString, node).emit_heredoc_reminder
-      end
-
     private
 
       def dispatch
-        writer_with(Writer::DynamicString, node).dispatch
+        dstr_writer.dispatch
+      end
+
+      def dstr_writer
+        writer_with(Writer::DynamicString, node:)
       end
+      memoize :dstr_writer
 
     end # DStr
   end # Emitter

data/lib/unparser/emitter/dsym.rb

@@ -33,7 +33,7 @@ module Unparser
 
       def emit_begin_child(component)
         write('#{')
-        visit(unwrap_single_begin(component))
+        visit(Util.one(component.children)) if component.children.any?
         write('}')
       end
     end # DSym

data/lib/unparser/emitter/ensure.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Unparser
+  class Emitter
+    # Emitter for ensure nodes
+    class Ensure < self
+      handle :ensure
+
+    private
+
+      def dispatch
+        emit_ensure(node)
+      end
+    end # Ensure
+  end # Emitter
+end # Unparser

data/lib/unparser/emitter/flow_modifier.rb

@@ -14,12 +14,6 @@ module Unparser
 
       handle(*MAP.keys)
 
-      def emit_heredoc_reminders
-        children.each do |node|
-          emitter(node).emit_heredoc_reminders
-        end
-      end
-
     private
 
       def dispatch
@@ -27,7 +21,7 @@ module Unparser
 
         if children.one? && n_if?(children.first)
           ws
-          emitter(children.first).emit_ternary
+          emitter(Util.one(children)).emit_ternary
         else
           emit_arguments unless children.empty?
         end

data/lib/unparser/emitter/for.rb

@@ -18,7 +18,7 @@ module Unparser
       end
 
       def emit_condition
-        visit(condition)
+        emitter(condition).emit_mlhs
         write(' in ')
         visit(assignment)
         write(' do')

data/lib/unparser/emitter/hash.rb

@@ -6,10 +6,6 @@ module Unparser
     class Hash < self
       handle :hash
 
-      def emit_heredoc_reminders
-        children.each(&method(:emit_heredoc_reminder_member))
-      end
-
     private
 
       def dispatch
@@ -24,10 +20,6 @@ module Unparser
         end
       end
 
-      def emit_heredoc_reminder_member(node)
-        emitter(node.children.last).emit_heredoc_reminders if n_pair?(node)
-      end
-
       def emit_hash_body
         delimited(children)
       end

data/lib/unparser/emitter/hash_pattern.rb

@@ -32,7 +32,7 @@ module Unparser
         when :match_var
           emit_match_var(node)
         when :match_rest
-          writer_with(MatchRest, node).emit_hash_pattern
+          writer_with(MatchRest, node:).emit_hash_pattern
         else
           visit(node)
         end

data/lib/unparser/emitter/in_pattern.rb

@@ -16,7 +16,7 @@ module Unparser
 
         ws
 
-        visit(target)
+        dispatch_target(target)
 
         if unless_guard
           ws
@@ -31,6 +31,14 @@ module Unparser
           nl
         end
       end
+
+      def dispatch_target(target)
+        if n_array?(target)
+          writer_with(Writer::Array, node: target).emit_compact
+        else
+          visit(target)
+        end
+      end
     end # InPattern
   end # Emitter
 end # Unparser

data/lib/unparser/emitter/index.rb

@@ -40,10 +40,6 @@ module Unparser
 
         private_constant(*constants(false))
 
-        def emit_heredoc_reminders
-          emitter(children.last).emit_heredoc_reminders
-        end
-
         def dispatch
           emit_receiver
           emit_operation(children[VALUE_RANGE])

data/lib/unparser/emitter/kwbegin.rb

@@ -12,7 +12,7 @@ module Unparser
         write('begin')
 
         if children.one?
-          emit_body_ensure_rescue(children.first)
+          emit_body_ensure_rescue(Util.one(children))
         else
           indented do
             emit_multiple_body

data/lib/unparser/emitter/match_pattern.rb

@@ -14,7 +14,12 @@ module Unparser
       def dispatch
         visit(target)
         write(' => ')
-        visit(pattern)
+
+        if n_array?(pattern)
+          writer_with(Writer::Array, node: pattern).emit_compact
+        else
+          visit(pattern)
+        end
       end
     end # MatchPattern
   end # Emitter

data/lib/unparser/emitter/match_pattern_p.rb

@@ -13,7 +13,12 @@ module Unparser
       def dispatch
         visit(target)
         write(' in ')
-        visit(pattern)
+
+        if n_array?(pattern)
+          writer_with(Writer::Array, node: pattern).emit_compact
+        else
+          visit(pattern)
+        end
       end
     end # MatchPatternP
   end # Emitter

data/lib/unparser/emitter/mlhs.rb

@@ -6,10 +6,16 @@ module Unparser
     class MLHS < self
       handle :mlhs
 
-      NO_COMMA = %i[arg splat mlhs restarg].freeze
+      NO_COMMA = %i[arg splat restarg].freeze
 
       private_constant(*constants(false))
 
+      def dispatch_def
+        parentheses do
+          delimited(children)
+        end
+      end
+
     private
 
       def dispatch

data/lib/unparser/emitter/op_assign.rb

@@ -14,11 +14,6 @@ module Unparser
 
       handle(*MAP.keys)
 
-      def emit_heredoc_reminders
-        emitter(target).emit_heredoc_reminders
-        emitter(expression).emit_heredoc_reminders
-      end
-
     private
 
       def dispatch
@@ -35,11 +30,6 @@ module Unparser
 
       children :target, :operator, :value
 
-      def emit_heredoc_reminders
-        emitter(target).emit_heredoc_reminders
-        emitter(value).emit_heredoc_reminders
-      end
-
     private
 
       def dispatch

data/lib/unparser/emitter/primitive.rb

@@ -7,19 +7,6 @@ module Unparser
 
       children :value
 
-      # Emitter for primitives based on Object#inspect
-      class Inspect < self
-
-        handle :str
-
-      private
-
-        def dispatch
-          write(value.inspect)
-        end
-
-      end # Inspect
-
       class Symbol < self
 
         handle :sym

data/lib/unparser/emitter/range.rb

@@ -25,9 +25,30 @@ module Unparser
     private
 
       def dispatch
-        visit(begin_node) if begin_node
+        visit_begin_node(begin_node)
         write(TOKENS.fetch(node.type))
-        visit(end_node) if end_node
+        visit_end_node(end_node)
+      end
+
+      def visit_begin_node(node)
+        return unless node
+
+        if n_array?(begin_node)
+          writer_with(Writer::Array, node: begin_node).emit_compact
+        else
+          visit(begin_node)
+        end
+      end
+
+      def visit_end_node(node)
+        return unless node
+
+        write(' ') if n_range?(node)
+        if n_array?(node)
+          writer_with(Writer::Array, node: node).emit_compact
+        else
+          visit(node)
+        end
       end
 
     end # Range

data/lib/unparser/emitter/regexp.rb

@@ -4,32 +4,20 @@ module Unparser
   class Emitter
     # Emitter for regexp literals
     class Regexp < self
-      handle :regexp
 
-      define_group(:body, 0..-2)
+      handle :regexp
 
     private
 
       def dispatch
-        parentheses('/', '/') do
-          body.each(&method(:emit_body))
-        end
-        emit_options
+        writer.dispatch
       end
 
-      def emit_options
-        write(children.last.children.join)
+      def writer
+        writer_with(Writer::Regexp, node:)
       end
+      memoize :writer
 
-      def emit_body(node)
-        if n_begin?(node)
-          write('#{')
-          node.children.each(&method(:visit))
-          write('}')
-        else
-          buffer.append_without_prefix(node.children.first.gsub('/', '\/'))
-        end
-      end
     end # Regexp
   end # Emitter
 end # Unparser

data/lib/unparser/emitter/rescue.rb

@@ -9,7 +9,13 @@ module Unparser
     private
 
       def dispatch
-        emit_rescue_postcontrol(node)
+        resbody = children.fetch(1)
+
+        if resbody.children.fetch(1)
+          emit_rescue_regular(node)
+        else
+          emit_rescue_postcontrol(node)
+        end
       end
     end # Rescue
   end # Emitter

data/lib/unparser/emitter/root.rb

@@ -2,22 +2,15 @@
 
 module Unparser
   class Emitter
-    # Root emitter a special case
     class Root < self
-      include Concord::Public.new(:buffer, :node, :comments)
-      include LocalVariableRoot
-
       END_NL = %i[class sclass module begin].freeze
 
       private_constant(*constants(false))
 
       def dispatch
-        if children.any?
-          emit_body(node, indent: false)
-        else
-          visit_deep(node)
-        end
+        emit_body(node, indent: false)
 
+        buffer.nl_flush_heredocs
         emit_eof_comments
 
         nl if END_NL.include?(node.type) && !buffer.fresh_line?

data/lib/unparser/emitter/send.rb

@@ -10,10 +10,6 @@ module Unparser
         writer.emit_mlhs
       end
 
-      def emit_heredoc_reminders
-        writer.emit_heredoc_reminders
-      end
-
     private
 
       def dispatch
@@ -21,7 +17,7 @@ module Unparser
       end
 
       def writer
-        writer_with(Writer::Send, node)
+        writer_with(Writer::Send, node:)
       end
       memoize :writer
     end # Send

data/lib/unparser/emitter/string.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Unparser
+  class Emitter
+    # Base class for primitive emitters
+    class String < self
+      children :value
+
+      handle :str
+
+    private
+
+      def dispatch
+        if explicit_encoding && !value.encoding.equal?(explicit_encoding)
+          write_utf8_escaped
+        else
+          write(value.inspect)
+        end
+      end
+
+      def write_utf8_escaped
+        write('"')
+        value.each_codepoint do |codepoint|
+          write("\\u{#{codepoint.to_s(16)}}")
+        end
+        write('"')
+      end
+
+    end # String
+  end # Emitter
+end # Unparser

data/lib/unparser/emitter/xstr.rb

@@ -41,6 +41,8 @@ module Unparser
         children.each do |child|
           if n_begin?(child)
             emit_begin(child)
+          elsif n_gvar?(child)
+            emit_gvar(child)
           else
             emit_string(child)
           end
@@ -64,9 +66,14 @@ module Unparser
 
       def emit_begin(component)
         write('#{')
-        visit(unwrap_single_begin(component))
+        visit(Util.one(component.children)) if component.children.any?
         write('}')
       end
+
+      def emit_gvar(component)
+        write('#')
+        write(Util.one(component.children).to_s)
+      end
     end # XStr
   end # Emitter
 end # Unparser

data/lib/unparser/emitter.rb

@@ -6,7 +6,7 @@ module Unparser
   # Emitter base class
   class Emitter
     include Adamantium, AbstractType, Constants, Generation, NodeHelpers
-    include Anima.new(:buffer, :comments, :node, :local_variable_scope)
+    include Anima.new(:buffer, :comments, :explicit_encoding, :local_variable_scope, :node)
 
     public :node
 
@@ -22,10 +22,9 @@ module Unparser
       #
       # @return [Parser::AST::Node]
       #
-      # @api private
-      #
+      # mutant:disable
       def local_variable_scope
-        AST::LocalVariableScope.new(node)
+        AST::LocalVariableScope.new(node: node, static_local_variables: Set.new)
       end
 
       def self.included(descendant)
@@ -67,7 +66,7 @@ module Unparser
     # @api private
     #
     # rubocop:disable Metrics/ParameterLists
-    def self.emitter(buffer:, comments:, node:, local_variable_scope:)
+    def self.emitter(buffer:, explicit_encoding:, comments:, node:, local_variable_scope:)
       type = node.type
 
       klass = REGISTRY.fetch(type) do
@@ -75,10 +74,11 @@ module Unparser
       end
 
       klass.new(
-        buffer:               buffer,
-        comments:             comments,
-        local_variable_scope: local_variable_scope,
-        node:                 node
+        buffer:,
+        comments:,
+        explicit_encoding:,
+        local_variable_scope:,
+        node:
       )
     end
     # rubocop:enable Metrics/ParameterLists
@@ -90,6 +90,5 @@ module Unparser
     # @api private
     #
     abstract_method :dispatch
-
   end # Emitter
 end # Unparser

data/lib/unparser/generation.rb

@@ -7,8 +7,6 @@ module Unparser
 
     private_constant(*constants(false))
 
-    def emit_heredoc_reminders; end
-
     def symbol_name; end
 
     def write_to_buffer
@@ -149,16 +147,22 @@ module Unparser
     def emit_body_inner(node)
       head, *tail = node.children
       emit_body_member(head)
+      write(';') if requires_explicit_statement_terminator?(head, tail)
 
       tail.each do |child|
-        nl
+        buffer.ensure_nl
 
         nl if EXTRA_NL.include?(child.type)
 
         emit_body_member(child)
+        write(';') if requires_explicit_statement_terminator?(child, tail)
       end
     end
 
+    def requires_explicit_statement_terminator?(node, nodes_group)
+      n_range?(node) && node.children.fetch(1).nil? && !node.eql?(nodes_group.fetch(-1))
+    end
+
     def emit_body_member(node)
       if n_rescue?(node)
         emit_rescue_postcontrol(node)
@@ -208,21 +212,20 @@ module Unparser
     end
 
     def emit_rescue_postcontrol(node)
-      writer = writer_with(Writer::Rescue, node)
+      writer = writer_with(Writer::Rescue, node:)
       writer.emit_postcontrol
-      writer.emit_heredoc_reminders
     end
 
     def emit_rescue_regular(node)
-      writer_with(Writer::Rescue, node).emit_regular
+      writer_with(Writer::Rescue, node:).emit_regular
     end
 
-    def writer_with(klass, node)
-      klass.new(to_h.merge(node: node))
+    def emitter(node)
+      Emitter.emitter(**to_h, node: node)
     end
 
-    def emitter(node)
-      Emitter.emitter(**to_h.merge(node: node))
+    def writer_with(klass, node:, **attributes)
+      klass.new(to_h.merge(node: node, **attributes))
     end
 
     def visit(node)
@@ -230,10 +233,7 @@ module Unparser
     end
 
     def visit_deep(node)
-      emitter(node).tap do |emitter|
-        emitter.write_to_buffer
-        emitter.emit_heredoc_reminders
-      end
+      emitter(node).tap(&:write_to_buffer)
     end
 
     def first_child

data/lib/unparser/node_details.rb

@@ -4,6 +4,7 @@ module Unparser
   module NodeDetails
     include Constants, NodeHelpers
 
+    # mutant:disable
     def self.included(descendant)
       descendant.class_eval do
         include Adamantium, Concord.new(:node)

data/lib/unparser/node_helpers.rb

@@ -31,7 +31,16 @@ module Unparser
       node.type.equal?(type)
     end
 
+    def n_flipflop?(node)
+      n_iflipflop?(node) || n_eflipflop?(node)
+    end
+
+    def n_range?(node)
+      n_irange?(node) || n_erange?(node)
+    end
+
     %i[
+      and
       arg
       args
       array
@@ -41,19 +50,26 @@ module Unparser
       cbase
       const
       dstr
+      eflipflop
       empty_else
+      erange
       ensure
+      gvar
       hash
       hash_pattern
       if
+      iflipflop
       in_pattern
       int
+      irange
       kwarg
       kwargs
       kwsplat
       lambda
       lvar
       match_rest
+      mlhs
+      or
       pair
       rescue
       send
@@ -61,20 +77,13 @@ module Unparser
       splat
       str
       sym
-    ].each do |type|
+      xstr
+    ].to_set.each do |type|
       name = "n_#{type}?"
       define_method(name) do |node|
         n?(type, node)
       end
       private(name)
     end
-
-    def unwrap_single_begin(node)
-      if n_begin?(node) && node.children.one?
-        node.children.first
-      else
-        node
-      end
-    end
   end # NodeHelpers
 end # Unparser

data/lib/unparser/util.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Unparser
+  # Original code before vendoring and reduction from: https://github.com/mbj/mutant/blob/main/lib/mutant/util.rb
+  module Util
+    # Error raised by `Util.one` if size is not exactly one
+    SizeError = Class.new(IndexError)
+
+    # Return only element in array if it contains exactly one member
+    #
+    # @param array [Array]
+    #
+    # @return [Object] first entry
+    def self.one(array)
+      case array
+      in [value]
+        value
+      else
+        fail SizeError, "expected size to be exactly 1 but size was #{array.size}"
+      end
+    end
+  end
+end