unparser 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52e96163f8fc7a9a3da3464e326997c9dc5a094225806e0f2fc72e0474a97026
-  data.tar.gz: 719ac295c33e15c44cbe9bff91920536367b37409e71fb407f1fecef2cd69dbf
+  metadata.gz: 1a1bb0cdd1d53883d86ca04f7ef43abedd068cffbf9ba370a85debb33e260e73
+  data.tar.gz: 5cfbeb83a56f3d6d1b4d921c8257d7e26d653cc0732176b76523fe3c9d375d5c
 SHA512:
-  metadata.gz: 661ff992d06f1c3f1ff05e66ecd789c08fc91432af9e082a036309a6d74bec83e99b58026f1e85080c86f2b8ab8d01de08bb8e743225e5204690670c9d0f280e
-  data.tar.gz: 338124c08c6e241f70f587db3e149da9562dfd18550bae2e1f4d6afaa76f9e3b9d39dae37ca1d81e7ff97d50e246a2a56faa984edb4988c05e9e69d6880d12ba
+  metadata.gz: ceee1a92f66ede9bcc67e477ae4271c4b28b80e846f68f368a95f52cc0968a093fb9cc22f7502d84e2c2ff60b3807fa8f12a6e736c54247afef813a3e09724bf
+  data.tar.gz: 3be9bd24acdb9f195341660a9bf8bb85c34cf519102418fa4f19e747914c4421fdca6448903660ab6903fb6e5f3ef863c06ad0f40984021ba72265625ce322c2

data/Changelog.md

@@ -1,4 +1,8 @@
-# v0.4.0 2018-12-01
+# v0.4.0 2018-12-03
+
+* Fix unparsing of `def foo(bar: bar())`
+
+# v0.4.0 2018-12-03
 
 * Change to modern AST format.
 * Add experimental `Unparser.{parser,parse,parse_with_comments}`

data/Gemfile

@@ -4,4 +4,4 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'mutant', git: 'https://github.com/mbj/mutant', branch: 'change/to-modern-ast'
+gem 'mutant', git: 'https://github.com/mbj/mutant'

data/Gemfile.lock

@@ -1,7 +1,6 @@
 GIT
   remote: https://github.com/mbj/mutant
-  revision: 6b36372385ec1bedc0d170470e65d7d33740769e
-  branch: change/to-modern-ast
+  revision: fd6bfe89c6be85433d116b62d1b2407af3ff7804
   specs:
     mutant (0.8.20)
       abstract_type (~> 0.0.7)
@@ -17,7 +16,7 @@ GIT
       parser (~> 2.5.1)
       procto (~> 0.0.2)
       regexp_parser (~> 1.2)
-      unparser (~> 0.3.0)
+      unparser (~> 0.4.0)
     mutant-rspec (0.8.20)
       mutant (~> 0.8.20)
       rspec-core (>= 3.4.0, < 4.0.0)
@@ -59,22 +58,22 @@ GEM
       equalizer (~> 0.0.9)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devtools (0.1.21)
+    devtools (0.1.22)
       abstract_type (~> 0.0.7)
       adamantium (~> 0.2.0)
       anima (~> 0.3.0)
       concord (~> 0.1.5)
-      flay (~> 2.10.0)
-      flog (~> 4.6.1)
-      mutant (~> 0.8.16)
-      mutant-rspec (~> 0.8.16)
+      flay (~> 2.12.0)
+      flog (~> 4.6.2)
+      mutant (~> 0.8.19)
+      mutant-rspec (~> 0.8.19)
       procto (~> 0.0.3)
       rake (~> 12.3.0)
-      reek (~> 5.0.2)
+      reek (~> 5.2.0)
       rspec (~> 3.8.0)
       rspec-core (~> 3.8.0)
       rspec-its (~> 1.2.0)
-      rubocop (~> 0.59.0)
+      rubocop (~> 0.60.0)
       simplecov (~> 0.16.1)
       yard (~> 0.9.16)
       yardstick (~> 0.9.9)
@@ -82,7 +81,7 @@ GEM
     docile (1.3.1)
     equalizer (0.0.11)
     erubis (2.7.0)
-    flay (2.10.0)
+    flay (2.12.0)
       erubis (~> 2.7.0)
       path_expander (~> 1.0)
       ruby_parser (~> 3.0)
@@ -114,7 +113,7 @@ GEM
     procto (0.0.3)
     rainbow (3.0.0)
     rake (12.3.1)
-    reek (5.0.2)
+    reek (5.2.0)
       codeclimate-engine-rb (~> 0.4.0)
       kwalify (~> 0.7.0)
       parser (>= 2.5.0.0, < 2.6, != 2.5.1.1)
@@ -136,14 +135,14 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.59.2)
+    rubocop (0.60.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (~> 1.4.0)
     ruby-progressbar (1.10.0)
     ruby_parser (3.11.0)
       sexp_processor (~> 4.9)

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 13
-total_score: 640
+total_score: 645

data/config/rubocop.yml

@@ -116,3 +116,7 @@ Lint/BooleanSymbol:
 
 Style/AccessModifierDeclarations:
   Enabled: false
+
+Layout/AlignHash:
+  EnforcedColonStyle: table
+  EnforcedHashRocketStyle: table

data/lib/unparser.rb

@@ -117,7 +117,6 @@ require 'unparser/emitter/send/unary'
 require 'unparser/emitter/send/binary'
 require 'unparser/emitter/send/regular'
 require 'unparser/emitter/send/conditional'
-require 'unparser/emitter/send/arguments'
 require 'unparser/emitter/send/attribute_assignment'
 require 'unparser/emitter/block'
 require 'unparser/emitter/assignment'

data/lib/unparser/ast.rb

@@ -13,10 +13,16 @@ module Unparser
     CLOSE_NODES   = (RESET_NODES + INHERIT_NODES).freeze
 
     # Nodes that assign a local variable
-    #
-    # FIXME: Kwargs are missing.
-    #
-    ASSIGN_NODES = %i[arg lvasgn optarg procarg0 restarg].freeze
+    ASSIGN_NODES =
+      %i[
+        arg
+        kwarg
+        kwoptarg
+        lvasgn
+        optarg
+        procarg0
+        restarg
+      ].to_set.freeze
 
     # Test for local variable inherited scope reset
     #

data/lib/unparser/emitter/argument.rb

@@ -100,7 +100,7 @@ module Unparser
       include Terminated
 
       MAP = {
-        blockarg: T_AMP,
+        blockarg:  T_AMP,
         kwrestarg: T_DSPLAT
       }.freeze
 

data/lib/unparser/emitter/send.rb

@@ -159,13 +159,52 @@ module Unparser
       # @api private
       #
       def emit_arguments
-        if arguments.empty? && receiver.nil? && local_variable_clash?
-          write('()')
+        if arguments.empty?
+          write('()') if receiver.nil? && avoid_clash?
         else
-          run(Arguments, n(:arguments, arguments))
+          normal_arguments
         end
       end
 
+      # Emit normal arguments
+      #
+      # @return [undefined]
+      #
+      # @api private
+      #
+      def normal_arguments
+        parentheses do
+          delimited_plain(effective_arguments)
+        end
+      end
+
+      # The effective arguments
+      #
+      # @return [Parser::AST::Node]
+      #
+      # @api private
+      #
+      def effective_arguments
+        last = arguments.length - 1
+        arguments.each_with_index.map do |argument, index|
+          if last.equal?(index) && argument.type.equal?(:hash) && argument.children.any?
+            argument.updated(:hash_body)
+          else
+            argument
+          end
+        end
+      end
+
+      # Test if clash with local variable or constant needs to be avoided
+      #
+      # @return [Boolean]
+      #
+      # @api private
+      #
+      def avoid_clash?
+        local_variable_clash? || parses_as_constant?
+      end
+
       # Test for local variable clash
       #
       # @return [Boolean]
@@ -185,6 +224,15 @@ module Unparser
         string_selector[NON_ASSIGN_RANGE]
       end
 
+      # Test if selector parses as constant
+      #
+      # @return [Boolean]
+      #
+      # @api private
+      #
+      def parses_as_constant?
+        Unparser.parse(selector.to_s).type.equal?(:const)
+      end
     end # Send
   end # Emitter
 end # Unparser

data/spec/unit/unparser_spec.rb

@@ -597,6 +597,10 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
         end.baz
       RUBY
 
+      assert_source <<~'RUBY'
+        FOO()
+      RUBY
+
       assert_terminated '(1..2).max'
       assert_terminated '1..2.max'
       assert_unterminated 'a || return'
@@ -1239,6 +1243,16 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
           end
         RUBY
 
+        assert_source <<~'RUBY'
+          def foo(bar: bar)
+          end
+        RUBY
+
+        assert_source <<~'RUBY'
+          def foo(bar: bar())
+          end
+        RUBY
+
         assert_source <<~'RUBY'
           def foo(*)
             bar

data/unparser.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name        = 'unparser'
-  gem.version     = '0.4.0'
+  gem.version     = '0.4.1'
 
   gem.authors     = ['Markus Schirp']
   gem.email       = 'mbj@schirp-dso.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Markus Schirp
@@ -235,7 +235,6 @@ files:
 - lib/unparser/emitter/retry.rb
 - lib/unparser/emitter/root.rb
 - lib/unparser/emitter/send.rb
-- lib/unparser/emitter/send/arguments.rb
 - lib/unparser/emitter/send/attribute_assignment.rb
 - lib/unparser/emitter/send/binary.rb
 - lib/unparser/emitter/send/conditional.rb

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

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-module Unparser
-  class Emitter
-    class Send
-      # Emitter for arguments of send nodes
-      class Arguments < Emitter
-
-      private
-
-        # Perform dispatch
-        #
-        # @return [undefined]
-        #
-        # @api private
-        #
-        def dispatch
-          return if children.empty?
-
-          parentheses do
-            delimited_plain(effective_arguments)
-          end
-        end
-
-        # Return effective arguments
-        #
-        # @return [Parser::AST::Node]
-        #
-        # @api private
-        #
-        def effective_arguments
-          last = children.length - 1
-          children.each_with_index.map do |argument, index|
-            if last.equal?(index) && argument.type.equal?(:hash) && argument.children.any?
-              argument.updated(:hash_body)
-            else
-              argument
-            end
-          end
-        end
-
-      end # Arguments
-    end # Send
-  end # Emitter
-end # Unparser