unparser 0.6.7 → 0.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43c55e0072230fba02c24266555e1599559396739677e4371b6c9bca4b2a29b1
-  data.tar.gz: 4743b675c63ed3cf84ee3c784b70fd5078f8ed4e022e02bde27473a7bf44dbbe
+  metadata.gz: f7ba6fe43070f8f0f156310dc9b588dfcb0dc9aef45c1eb639250efb1622d3dd
+  data.tar.gz: b73a4e1be5514ca85e2014be9008b59ed1a6847f370682a505d8e718d2e7cbef
 SHA512:
-  metadata.gz: 94bc33d333f3652cbdfa12169432d7a139b568cb72d4ae08994921760d2f7c8348a8d35f717053c059866ce7e640d08c9af6495a5e37132b2b667d1895b889da
-  data.tar.gz: ee2ee8e37250de111c419566c74d7b5954b02137f9e6fcb88cf9ff26820583698faf2533e6d01ae5738481bab91797060e2773781e9c93cb8da26efce602c1b0
+  metadata.gz: c360281c3941b7094ee10e09718e6b37f2de361af373942313692728f95160b3c94b979b3fe352804c7f91768edaf3e448e7ec406d392c8eeb68e1f9002ade62
+  data.tar.gz: 962d1c44aaa8d94aae4e60997dd75a2c8535b6a6f054f5aa382ff112c3c335a8a67d01af5700781073dce1e6e1b1f20567d7b532b2e1b7fc7dca71a701b26b10

data/README.md

@@ -10,13 +10,13 @@ The following constraints apply:
 
 * No support for macruby extensions
 * Only support for the [modern AST](https://github.com/whitequark/parser/#usage) format
-* Only support for Ruby >= 2.7
+* Only support for Ruby >= 3.1
 
 Notable Users:
 
 * [mutant](https://github.com/mbj/mutant) - Code review engine via mutation testing.
 * [ruby-next](https://github.com/ruby-next/ruby-next) - Ruby Syntax Backports.
-* May other [reverse-dependencies](https://rubygems.org/gems/unparser/reverse_dependencies).
+* Many other [reverse-dependencies](https://rubygems.org/gems/unparser/reverse_dependencies).
 
 (if you want your tool to be mentioned here please PR the addition with a TLDR of your use case).
 

data/lib/unparser/adamantium.rb

@@ -20,9 +20,11 @@ module Unparser
       # @return [Object]
       #
       # @api public
+      #
+      # mutant:disable
       def freeze
         memoized_method_cache
-        super()
+        super
       end
 
     private

data/lib/unparser/ast/local_variable_scope.rb

@@ -5,7 +5,7 @@ module Unparser
 
     # Calculated local variable scope for a given node
     class LocalVariableScope
-      include Enumerable, Adamantium, Concord.new(:node)
+      include Enumerable, Adamantium
 
       # Initialize object
       #
@@ -21,7 +21,6 @@ module Unparser
           items << scope
         end
         @items = items
-        super(node)
       end
 
       # Test if local variable was first at given assignment

data/lib/unparser/cli.rb

@@ -169,11 +169,11 @@ module Unparser
 
     def targets(file_name)
       if File.directory?(file_name)
-        Dir.glob(File.join(file_name, '**/*.rb')).sort
+        Dir.glob(File.join(file_name, '**/*.rb'))
       elsif File.file?(file_name)
         [file_name]
       else
-        Dir.glob(file_name).sort
+        Dir.glob(file_name)
       end.map { |file| Target::Path.new(Pathname.new(file)) }
     end
   end # CLI

data/lib/unparser/color.rb

@@ -30,8 +30,10 @@ module Unparser
 
       # Well rubocop you are static so you do not have a clue here ;)
       # rubocop:disable Style/RedundantInitialize
+      # rubocop:disable Style/MissingSuper
       def initialize; end
       # rubocop:enable Style/RedundantInitialize
+      # rubocop:enable Style/MissingSuper
 
     end.new
 

data/lib/unparser/emitter/flipflop.rb

@@ -25,9 +25,14 @@ module Unparser
     private
 
       def dispatch
-        visit(left)
+        visit(left) if left
         write(MAP.fetch(node.type))
-        visit(right)
+
+        if right
+          visit(right)
+        else
+          write(';')
+        end
       end
     end # FlipFLop
   end # Emitter

data/lib/unparser/emitter/hash.rb

@@ -25,7 +25,7 @@ module Unparser
       end
 
       def emit_heredoc_reminder_member(node)
-        emitter(node.children.last).emit_heredoc_reminders
+        emitter(node.children.last).emit_heredoc_reminders if n_pair?(node)
       end
 
       def emit_hash_body

data/lib/unparser/emitter/match_pattern.rb

@@ -9,20 +9,11 @@ module Unparser
 
       children :target, :pattern
 
-      # Modern ast format emits `match_pattern`
-      # node on single line pre 3.0, but 3.0+ uses `match_pattern_p`
-      SYMBOL =
-        if RUBY_VERSION < '3.0'
-          ' in '
-        else
-          ' => '
-        end
-
     private
 
       def dispatch
         visit(target)
-        write(SYMBOL)
+        write(' => ')
         visit(pattern)
       end
     end # MatchPattern

data/lib/unparser/emitter/op_assign.rb

@@ -35,6 +35,11 @@ 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/pair.rb

@@ -15,19 +15,30 @@ module Unparser
     private
 
       def dispatch
-        if colon?(key)
-          write(key.children.first.to_s, ': ')
+        if colon?
+          emit_colon
+          unless implicit_value?
+            write(' ')
+            visit(value)
+          end
         else
           visit(key)
           write(' => ')
+          visit(value)
         end
-
-        visit(value)
       end
 
-      def colon?(key)
+      def colon?
         n_sym?(key) && BAREWORD.match?(key.children.first)
       end
+
+      def emit_colon
+        write(key.children.first.to_s, ':')
+      end
+
+      def implicit_value?
+        n_lvar?(value) && value.children.first.equal?(key.children.first)
+      end
     end
   end
 end

data/lib/unparser/emitter/primitive.rb

@@ -10,7 +10,7 @@ module Unparser
       # Emitter for primitives based on Object#inspect
       class Inspect < self
 
-        handle :sym, :str
+        handle :str
 
       private
 
@@ -20,6 +20,32 @@ module Unparser
 
       end # Inspect
 
+      class Symbol < self
+
+        handle :sym
+
+        private
+
+        # mutant:disable
+        def dispatch
+          if inspect_breaks_parsing?
+            write(":#{value.name.inspect}")
+          else
+            write(value.inspect)
+          end
+        end
+
+        # mutant:disable
+        def inspect_breaks_parsing?
+          return false unless RUBY_VERSION < '3.2.'
+
+          Unparser.parse(value.inspect)
+          false
+        rescue Parser::SyntaxError
+          true
+        end
+      end # Symbol
+
       # Emitter for complex literals
       class Complex < self
 

data/lib/unparser/generation.rb

@@ -121,25 +121,29 @@ module Unparser
     end
 
     def emit_body(node, indent: true)
-      if indent
-        buffer.indent
-        nl
-      end
-
-      if n_begin?(node)
-        if node.children.one?
-          visit_deep(node)
+      with_indent(indent: indent) do
+        if n_begin?(node)
+          if node.children.empty?
+            write('()')
+          elsif node.children.one?
+            visit_deep(node)
+          else
+            emit_body_inner(node)
+          end
         else
-          emit_body_inner(node)
+          visit_deep(node)
         end
-      else
-        visit_deep(node)
       end
+    end
 
-      if indent
-        buffer.unindent
-        nl
-      end
+    def with_indent(indent:)
+      return yield unless indent
+
+      buffer.indent
+      nl
+      yield
+      buffer.unindent
+      nl
     end
 
     def emit_body_inner(node)

data/lib/unparser/node_details/send.rb

@@ -20,6 +20,7 @@ module Unparser
 
       def binary_syntax_allowed?
         selector_binary_operator? \
+          && n_send?(node) \
           && arguments.one? \
           && !n_splat?(arguments.first) \
           && !n_kwargs?(arguments.first)

data/lib/unparser/node_helpers.rb

@@ -52,6 +52,7 @@ module Unparser
       kwargs
       kwsplat
       lambda
+      lvar
       match_rest
       pair
       rescue

data/lib/unparser/validation.rb

@@ -17,6 +17,7 @@ module Unparser
     #
     # @api private
     #
+    # rubocop:disable Style/OperatorMethodCall
     def success?
       [
         original_source,
@@ -25,6 +26,7 @@ module Unparser
         generated_node
       ].all?(&:right?) && generated_node.from_right.==(original_node.from_right)
     end
+    # rubocop:enable Style/OperatorMethodCall
 
     # Return error report
     #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.14
 platform: ruby
 authors:
 - Markus Schirp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-08 00:00:00.000000000 Z
+date: 2024-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: mutant
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.18
+        version: 0.12.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.18
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: mutant-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.18
+        version: 0.12.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.18
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -251,6 +251,7 @@ metadata:
   bug_tracker_uri: https://github.com/mbj/unparser/issues
   changelog_uri: https://github.com/mbj/unparser/blob/master/Changelog.md
   funding_uri: https://github.com/sponsors/mbj
+  source_code_uri: https://github.com/mbj/unparser
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -260,7 +261,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="