ruby-next-core 0.10.5 → 0.11.0

data/lib/ruby-next/language/rewriters/pattern_matching.rb

@@ -13,12 +13,12 @@ module RubyNext
 
           # Useful to generate simple operation nodes
           # (e.g., 'a + b')
-          def -(val)
-            ::Parser::AST::Node.new(:send, [self, :-, val.to_ast_node])
+          def -(other)
+            ::Parser::AST::Node.new(:send, [self, :-, other.to_ast_node])
           end
 
-          def +(val)
-            ::Parser::AST::Node.new(:send, [self, :+, val.to_ast_node])
+          def +(other)
+            ::Parser::AST::Node.new(:send, [self, :+, other.to_ast_node])
           end
         end
 
@@ -218,9 +218,10 @@ module RubyNext
             predicate_clause(:respond_to_deconstruct_keys, node)
           end
 
-          def hash_key(node, key)
-            key = key.children.first if key.is_a?(::Parser::AST::Node)
-            predicate_clause(:"hash_key_#{key}", node)
+          def hash_keys(node, keys)
+            keys = keys.map { |key| key.is_a?(::Parser::AST::Node) ? key.children.first : key }
+
+            predicate_clause(:"hash_keys_#{keys.join("_p_")}", node)
           end
         end
       end
@@ -266,7 +267,7 @@ module RubyNext
           )
         end
 
-        def on_in_match(node)
+        def on_match_pattern(node)
           context.track! self
 
           @deconstructed_keys = {}
@@ -303,6 +304,8 @@ module RubyNext
           end
         end
 
+        alias on_in_match on_match_pattern
+
         private
 
         def rewrite_case_in!(node, matchee, new_node)
@@ -883,14 +886,14 @@ module RubyNext
         end
 
         def having_hash_keys(keys, hash = s(:lvar, locals[:hash]))
-          key = keys.shift
-          node = predicates.hash_key(hash_has_key(key, hash), key)
+          keys.reduce(nil) do |acc, key|
+            pnode = hash_has_key(key, hash)
+            next pnode unless acc
 
-          keys.reduce(node) do |res, key|
             s(:begin,
-              s(:and,
-                res,
-                predicates.hash_key(hash_has_key(key, hash), key)))
+              s(:and, acc, pnode))
+          end.then do |node|
+            predicates.hash_keys(node, keys)
           end
         end
 

data/lib/ruby-next/language/setup.rb

@@ -2,6 +2,7 @@
 
 # Make sure Core is loaded
 require "ruby-next"
+require "pathname"
 
 module RubyNext
   module Language
@@ -48,11 +49,13 @@ module RubyNext
 
         GemTranspiler.maybe_transpile(File.dirname(dirname), lib_dir, next_dirname) if transpile
 
-        current_index = $LOAD_PATH.index(dirname)
+        current_index = $LOAD_PATH.find_index do |load_path|
+          Pathname.new(load_path).cleanpath.to_s == dirname
+        end
 
         raise "Gem's lib is not in the $LOAD_PATH: #{dirname}" if current_index.nil?
 
-        version = RubyNext.next_version
+        version = RubyNext.next_ruby_version
 
         loop do
           break unless version
@@ -64,7 +67,7 @@ module RubyNext
             current_index += 1
           end
 
-          version = RubyNext.next_version(version)
+          version = RubyNext.next_ruby_version(version)
         end
       end
     end

data/lib/ruby-next/language/unparser.rb

@@ -6,3 +6,13 @@ require "parser/current"
 $VERBOSE = save_verbose
 
 require "unparser"
+
+# PR: https://github.com/mbj/unparser/pull/230
+if defined? Unparser::Emitter::InPattern
+  Unparser::Emitter::InPattern.prepend(Module.new do
+    def dispatch
+      super
+      nl unless branch
+    end
+  end)
+end

data/lib/ruby-next/rubocop.rb

@@ -4,6 +4,7 @@
 # edge features and fix some bugs with 2.7+ syntax
 
 require "parser/ruby-next/version"
+require "ruby-next/language/parser"
 
 module RuboCop
   # Transform Ruby Next parser version to a float, e.g.: "2.8.0.1" => 2.801
@@ -37,7 +38,6 @@ module RuboCop
       def parser_class(version)
         return super unless version == RUBY_NEXT_VERSION
 
-        require "parser/rubynext"
         Parser::RubyNext
       end
     end
@@ -52,7 +52,7 @@ module RuboCop
   module AST
     module Traversal
       # Fixed in https://github.com/rubocop-hq/rubocop/pull/7786
-      %i[case_match in_pattern find_pattern].each do |type|
+      %i[case_match in_pattern find_pattern match_pattern match_pattern_p].each do |type|
         next if method_defined?(:"on_#{type}")
         module_eval(<<-RUBY, __FILE__, __LINE__ + 1)
 def on_#{type}(node)
@@ -62,6 +62,10 @@ end
         RUBY
       end
     end
+
+    unless Builder.method_defined?(:match_pattern_p)
+      Builder.include RubyNext::Language::BuilderExt
+    end
   end
 end
 # rubocop:enable Layout/HeredocIndentation
@@ -102,27 +106,14 @@ module RuboCop
           send(:"on_#{body_node.type}", body_node)
         end
       end
-
-      unless method_defined?(:on_rasgn)
-        def on_rasgn(node)
-          val_node, asgn_node = *node
-          send(:"on_#{asgn_node.type}", asgn_node)
-          send(:"on_#{val_node.type}", val_node)
-        end
-
-        def on_mrasgn(node)
-          lhs, rhs = *node
-          send(:"on_#{lhs.type}", lhs)
-          send(:"on_#{rhs.type}", rhs)
-        end
-      end
     end
 
     module Layout
       require "rubocop/cop/layout/assignment_indentation"
-      AssignmentIndentation.prepend(Module.new do
-        POTENTIAL_RIGHT_TYPES = %i[ivasgn lvasgn cvasgn gvasgn casgn masgn].freeze
 
+      POTENTIAL_RIGHT_TYPES = %i[ivasgn lvasgn cvasgn gvasgn casgn masgn].freeze
+
+      AssignmentIndentation.prepend(Module.new do
         def check_assignment(node, *)
           return if rightward?(node)
           super

data/lib/ruby-next/setup_self.rb

@@ -3,7 +3,7 @@
 # This file setup LOAD_PATH to load Ruby Next own transpiled paths
 # (we cannot use language/setup here, 'cause it requires Core to be loaded)
 
-version = RubyNext.next_version
+version = RubyNext.next_ruby_version
 next_dirname = File.join(__dir__, "..", ".rbnext")
 lib_path = File.realpath(File.join(__dir__, ".."))
 current_index = $LOAD_PATH.index(lib_path)
@@ -18,5 +18,5 @@ loop do
     current_index += 1
   end
 
-  version = RubyNext.next_version(version)
+  version = RubyNext.next_ruby_version(version)
 end

data/lib/ruby-next/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyNext
-  VERSION = "0.10.5"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-next-core
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.11.0
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2020-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-next-parser
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.1
+        version: 3.0.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.1
+        version: 3.0.0.3
 - !ruby/object:Gem::Dependency
   name: unparser
   requirement: !ruby/object:Gem::Requirement
@@ -68,13 +68,14 @@ files:
 - lib/.rbnext/2.3/ruby-next/language/rewriters/base.rb
 - lib/.rbnext/2.3/ruby-next/language/rewriters/endless_range.rb
 - lib/.rbnext/2.3/ruby-next/language/rewriters/pattern_matching.rb
-- lib/.rbnext/2.3/ruby-next/language/rewriters/right_hand_assignment.rb
 - lib/.rbnext/2.3/ruby-next/utils.rb
+- lib/.rbnext/2.7/ruby-next/core.rb
 - lib/ruby-next.rb
 - lib/ruby-next/cli.rb
 - lib/ruby-next/commands/base.rb
 - lib/ruby-next/commands/core_ext.rb
 - lib/ruby-next/commands/nextify.rb
+- lib/ruby-next/config.rb
 - lib/ruby-next/core.rb
 - lib/ruby-next/core/array/deconstruct.rb
 - lib/ruby-next/core/array/difference_union_intersection.rb
@@ -105,14 +106,15 @@ files:
 - lib/ruby-next/language/parser.rb
 - lib/ruby-next/language/proposed.rb
 - lib/ruby-next/language/rewriters/args_forward.rb
+- lib/ruby-next/language/rewriters/args_forward_leading.rb
 - lib/ruby-next/language/rewriters/base.rb
 - lib/ruby-next/language/rewriters/endless_method.rb
 - lib/ruby-next/language/rewriters/endless_range.rb
 - lib/ruby-next/language/rewriters/find_pattern.rb
+- lib/ruby-next/language/rewriters/in_pattern.rb
 - lib/ruby-next/language/rewriters/method_reference.rb
 - lib/ruby-next/language/rewriters/numbered_params.rb
 - lib/ruby-next/language/rewriters/pattern_matching.rb
-- lib/ruby-next/language/rewriters/right_hand_assignment.rb
 - lib/ruby-next/language/rewriters/runtime.rb
 - lib/ruby-next/language/rewriters/runtime/dir.rb
 - lib/ruby-next/language/rewriters/safe_navigation.rb

data/lib/.rbnext/2.3/ruby-next/language/rewriters/right_hand_assignment.rb

@@ -1,117 +0,0 @@
-# frozen_string_literal: true
-
-module RubyNext
-  module Language
-    module Rewriters
-      class RightHandAssignment < Base
-        NAME = "right-hand-assignment"
-        SYNTAX_PROBE = "1 + 2 => a"
-        MIN_SUPPORTED_VERSION = Gem::Version.new("3.0.0")
-
-        def on_rasgn(node)
-          context.track! self
-
-          node = super(node)
-
-          val_node, asgn_node = *node
-
-          remove(val_node.loc.expression.end.join(asgn_node.loc.expression))
-          insert_before(val_node.loc.expression, "#{asgn_node.loc.expression.source} = ")
-
-          asgn_node.updated(
-            nil,
-            asgn_node.children + [val_node]
-          )
-        end
-
-        def on_vasgn(node)
-          return super(node) unless rightward?(node)
-
-          context.track! self
-
-          name, val_node = *node
-
-          remove(val_node.loc.expression.end.join(node.loc.name))
-          insert_before(val_node.loc.expression, "#{name} = ")
-
-          super(node)
-        end
-
-        def on_casgn(node)
-          return super(node) unless rightward?(node)
-
-          context.track! self
-
-          scope_node, name, val_node = *node
-
-          if scope_node
-            scope = scope_node.type == :cbase ? scope_node.loc.expression.source : "#{scope_node.loc.expression.source}::"
-            name = "#{scope}#{name}"
-          end
-
-          remove(val_node.loc.expression.end.join(node.loc.name))
-          insert_before(val_node.loc.expression, "#{name} = ")
-
-          super(node)
-        end
-
-        def on_mrasgn(node)
-          context.track! self
-
-          node = super(node)
-
-          lhs, rhs = *node
-
-          replace(lhs.loc.expression.end.join(rhs.loc.expression), ")")
-          insert_before(lhs.loc.expression, "#{rhs.loc.expression.source} = (")
-
-          node.updated(
-            :masgn,
-            [rhs, lhs]
-          )
-        end
-
-        def on_masgn(node)
-          return super(node) unless rightward?(node)
-
-          context.track! self
-
-          rhs, lhs = *node
-
-          replace(lhs.loc.expression.end.join(rhs.loc.expression), ")")
-          insert_before(lhs.loc.expression, "#{rhs.loc.expression.source} = (")
-
-          node = super(node)
-
-          lhs, rhs = *node
-
-          node.updated(
-            nil,
-            [
-              lhs,
-              s(:begin, rhs)
-            ]
-          )
-        end
-
-        private
-
-        def rightward?(node)
-          # Location could be empty for node built by rewriters
-          return false unless ((!node.loc.nil? || nil) && node.loc.operator)
-
-          assignee_loc =
-            if node.type == :masgn
-              node.children[0].loc.expression
-            else
-              node.loc.name
-            end
-
-          return false unless assignee_loc
-
-          assignee_loc.begin_pos > node.loc.operator.end_pos
-        end
-      end
-    end
-  end
-end

data/lib/ruby-next/language/rewriters/right_hand_assignment.rb

@@ -1,117 +0,0 @@
-# frozen_string_literal: true
-
-module RubyNext
-  module Language
-    module Rewriters
-      class RightHandAssignment < Base
-        NAME = "right-hand-assignment"
-        SYNTAX_PROBE = "1 + 2 => a"
-        MIN_SUPPORTED_VERSION = Gem::Version.new("3.0.0")
-
-        def on_rasgn(node)
-          context.track! self
-
-          node = super(node)
-
-          val_node, asgn_node = *node
-
-          remove(val_node.loc.expression.end.join(asgn_node.loc.expression))
-          insert_before(val_node.loc.expression, "#{asgn_node.loc.expression.source} = ")
-
-          asgn_node.updated(
-            nil,
-            asgn_node.children + [val_node]
-          )
-        end
-
-        def on_vasgn(node)
-          return super(node) unless rightward?(node)
-
-          context.track! self
-
-          name, val_node = *node
-
-          remove(val_node.loc.expression.end.join(node.loc.name))
-          insert_before(val_node.loc.expression, "#{name} = ")
-
-          super(node)
-        end
-
-        def on_casgn(node)
-          return super(node) unless rightward?(node)
-
-          context.track! self
-
-          scope_node, name, val_node = *node
-
-          if scope_node
-            scope = scope_node.type == :cbase ? scope_node.loc.expression.source : "#{scope_node.loc.expression.source}::"
-            name = "#{scope}#{name}"
-          end
-
-          remove(val_node.loc.expression.end.join(node.loc.name))
-          insert_before(val_node.loc.expression, "#{name} = ")
-
-          super(node)
-        end
-
-        def on_mrasgn(node)
-          context.track! self
-
-          node = super(node)
-
-          lhs, rhs = *node
-
-          replace(lhs.loc.expression.end.join(rhs.loc.expression), ")")
-          insert_before(lhs.loc.expression, "#{rhs.loc.expression.source} = (")
-
-          node.updated(
-            :masgn,
-            [rhs, lhs]
-          )
-        end
-
-        def on_masgn(node)
-          return super(node) unless rightward?(node)
-
-          context.track! self
-
-          rhs, lhs = *node
-
-          replace(lhs.loc.expression.end.join(rhs.loc.expression), ")")
-          insert_before(lhs.loc.expression, "#{rhs.loc.expression.source} = (")
-
-          node = super(node)
-
-          lhs, rhs = *node
-
-          node.updated(
-            nil,
-            [
-              lhs,
-              s(:begin, rhs)
-            ]
-          )
-        end
-
-        private
-
-        def rightward?(node)
-          # Location could be empty for node built by rewriters
-          return false unless node.loc&.operator
-
-          assignee_loc =
-            if node.type == :masgn
-              node.children[0].loc.expression
-            else
-              node.loc.name
-            end
-
-          return false unless assignee_loc
-
-          assignee_loc.begin_pos > node.loc.operator.end_pos
-        end
-      end
-    end
-  end
-end