ruby-next-core 0.13.0 → 0.14.0

data/lib/ruby-next/language/rewriters/proposed/bind_vars_pattern.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module RubyNext
+  module Language
+    module Rewriters
+      using RubyNext
+
+      # Separate pattern matching rewriter for Ruby <3.2 to
+      # transpile patterns with variable (instance, class, global) binding
+      class BindVarsPattern < PatternMatching
+        NAME = "pattern-matching-find-pattern"
+        SYNTAX_PROBE = "case 0; in @a; true; else; 1; end"
+        MIN_SUPPORTED_VERSION = Gem::Version.new(RubyNext::NEXT_VERSION)
+
+        def on_case_match(node)
+          @has_vars_pattern = false
+          process_regular_node(node).then do |new_node|
+            return new_node unless has_vars_pattern
+            super(node)
+          end
+        end
+
+        def on_match_pattern(node)
+          @has_vars_pattern = false
+          process_regular_node(node).then do |new_node|
+            return new_node unless has_vars_pattern
+            super(node)
+          end
+        end
+
+        def on_match_pattern_p(node)
+          @has_vars_pattern = false
+          process_regular_node(node).then do |new_node|
+            return new_node unless has_vars_pattern
+            super(node)
+          end
+        end
+
+        def on_match_var(node)
+          @has_vars_pattern = true if node.children[0].is_a?(::Parser::AST::Node)
+          super(node)
+        end
+
+        private
+
+        attr_reader :has_vars_pattern
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# Load experimental, proposed etc. Ruby features
+
+require "ruby-next/language/rewriters/proposed/method_reference"
+RubyNext::Language.rewriters << RubyNext::Language::Rewriters::MethodReference
+
+require "ruby-next/language/rewriters/proposed/bind_vars_pattern"
+RubyNext::Language.rewriters << RubyNext::Language::Rewriters::BindVarsPattern

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
 # Load rewriters only required for runtime transpiling
-
-require "ruby-next/language/rewriters/runtime/dir"
+require "ruby-next/language/rewriters/2.4/dir"
 RubyNext::Language.rewriters << RubyNext::Language::Rewriters::Dir

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

@@ -50,7 +50,8 @@ module RubyNext
         GemTranspiler.maybe_transpile(File.dirname(dirname), lib_dir, next_dirname) if transpile
 
         current_index = $LOAD_PATH.find_index do |load_path|
-          Pathname.new(load_path).realpath.to_s == dirname
+          pn = Pathname.new(load_path)
+          pn.exist? && pn.realpath.to_s == dirname
         end
 
         raise "Gem's lib is not in the $LOAD_PATH: #{dirname}" if current_index.nil?

data/lib/ruby-next/language.rb

@@ -174,54 +174,72 @@ module RubyNext
 
     require "ruby-next/language/rewriters/base"
 
-    require "ruby-next/language/rewriters/squiggly_heredoc"
+    require "ruby-next/language/rewriters/2.1/numeric_literals"
+    rewriters << Rewriters::NumericLiterals
+
+    require "ruby-next/language/rewriters/2.1/required_kwargs"
+    rewriters << Rewriters::RequiredKwargs
+
+    require "ruby-next/language/rewriters/2.3/squiggly_heredoc"
     rewriters << Rewriters::SquigglyHeredoc
 
-    require "ruby-next/language/rewriters/safe_navigation"
+    require "ruby-next/language/rewriters/2.3/safe_navigation"
     rewriters << Rewriters::SafeNavigation
 
-    require "ruby-next/language/rewriters/numeric_literals"
-    rewriters << Rewriters::NumericLiterals
+    require "ruby-next/language/rewriters/2.7/args_forward"
+    rewriters << Rewriters::ArgsForward
 
-    require "ruby-next/language/rewriters/required_kwargs"
-    rewriters << Rewriters::RequiredKwargs
+    require "ruby-next/language/rewriters/2.7/numbered_params"
+    rewriters << Rewriters::NumberedParams
 
-    require "ruby-next/language/rewriters/args_forward"
-    rewriters << Rewriters::ArgsForward
+    require "ruby-next/language/rewriters/2.7/pattern_matching"
+    rewriters << Rewriters::PatternMatching
 
     # Must be added after general args forward rewriter to become
     # no-op in Ruby <2.7
-    require "ruby-next/language/rewriters/args_forward_leading"
+    require "ruby-next/language/rewriters/3.0/args_forward_leading"
     rewriters << Rewriters::ArgsForwardLeading
 
-    require "ruby-next/language/rewriters/numbered_params"
-    rewriters << Rewriters::NumberedParams
-
-    require "ruby-next/language/rewriters/pattern_matching"
-    rewriters << Rewriters::PatternMatching
-
     # Must be added after general pattern matching rewriter to become
     # no-op in Ruby <2.7
-    require "ruby-next/language/rewriters/find_pattern"
+    require "ruby-next/language/rewriters/3.0/find_pattern"
     rewriters << Rewriters::FindPattern
 
-    require "ruby-next/language/rewriters/in_pattern"
+    require "ruby-next/language/rewriters/3.0/in_pattern"
     rewriters << Rewriters::InPattern
 
+    require "ruby-next/language/rewriters/3.0/endless_method"
+    RubyNext::Language.rewriters << RubyNext::Language::Rewriters::EndlessMethod
+
+    require "ruby-next/language/rewriters/3.1/oneline_pattern_parensless"
+    rewriters << Rewriters::OnelinePatternParensless
+
+    require "ruby-next/language/rewriters/3.1/pin_vars_pattern"
+    rewriters << Rewriters::PinVarsPattern
+
+    require "ruby-next/language/rewriters/3.1/anonymous_block"
+    rewriters << Rewriters::AnonymousBlock
+
+    require "ruby-next/language/rewriters/3.1/refinement_import_methods"
+    rewriters << Rewriters::RefinementImportMethods
+
+    require "ruby-next/language/rewriters/3.1/endless_method_command"
+    rewriters << Rewriters::EndlessMethodCommand
+
+    require "ruby-next/language/rewriters/3.1/shorthand_hash"
+    rewriters << RubyNext::Language::Rewriters::ShorthandHash
+
     # Put endless range in the end, 'cause Parser fails to parse it in
     # pattern matching
-    require "ruby-next/language/rewriters/endless_range"
+    require "ruby-next/language/rewriters/2.6/endless_range"
     rewriters << Rewriters::EndlessRange
 
-    require "ruby-next/language/rewriters/endless_method"
-    RubyNext::Language.rewriters << RubyNext::Language::Rewriters::EndlessMethod
-
     if ENV["RUBY_NEXT_EDGE"] == "1"
-      require "ruby-next/language/edge"
+      require "ruby-next/language/rewriters/edge"
     end
 
     if ENV["RUBY_NEXT_PROPOSED"] == "1"
-      require "ruby-next/language/proposed"
+      require "ruby-next/language/rewriters/proposed"
     end
   end
 end

data/lib/ruby-next/rubocop.rb

@@ -79,10 +79,6 @@ module RuboCop
         trigger_responding_cops(:on_meth_ref, node)
       end
 
-      def on_ipair(node)
-        trigger_responding_cops(:on_ipair, node)
-      end
-
       unless method_defined?(:on_numblock)
         def on_numblock(node)
           children = node.children
@@ -108,6 +104,21 @@ module RuboCop
       end
     end
 
+    Commissioner.prepend(Module.new do
+      # Ignore anonymous blocks
+      def on_block_pass(node)
+        return if node.children == [nil]
+
+        super
+      end
+
+      def on_blockarg(node)
+        return if node.children == [nil]
+
+        super
+      end
+    end)
+
     module Layout
       require "rubocop/cop/layout/assignment_indentation"
 
@@ -147,6 +158,15 @@ module RuboCop
           node.loc.expression.line
         end
       end)
+
+      require "rubocop/cop/layout/space_after_colon"
+      SpaceAfterColon.prepend(Module.new do
+        def on_pair(node)
+          return if node.children[0].loc.last_column == node.children[1].loc.last_column
+
+          super(node)
+        end
+      end)
     end
 
     module Style

data/lib/ruby-next/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-next-core
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2021-12-29 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.3
+        version: 3.1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.3
+        version: 3.1.1.0
 - !ruby/object:Gem::Dependency
   name: unparser
   requirement: !ruby/object:Gem::Requirement
@@ -61,9 +61,10 @@ files:
 - lib/.rbnext/2.3/ruby-next/commands/core_ext.rb
 - lib/.rbnext/2.3/ruby-next/commands/nextify.rb
 - lib/.rbnext/2.3/ruby-next/language/eval.rb
+- lib/.rbnext/2.3/ruby-next/language/rewriters/2.6/endless_range.rb
+- lib/.rbnext/2.3/ruby-next/language/rewriters/2.7/pattern_matching.rb
+- lib/.rbnext/2.3/ruby-next/language/rewriters/3.1/anonymous_block.rb
 - 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/utils.rb
 - lib/.rbnext/2.7/ruby-next/core.rb
 - lib/ruby-next.rb
@@ -78,6 +79,7 @@ files:
 - lib/ruby-next/core/array/intersect.rb
 - lib/ruby-next/core/constants/frozen_error.rb
 - lib/ruby-next/core/constants/no_matching_pattern_error.rb
+- lib/ruby-next/core/enumerable/compact.rb
 - lib/ruby-next/core/enumerable/filter.rb
 - lib/ruby-next/core/enumerable/filter_map.rb
 - lib/ruby-next/core/enumerable/tally.rb
@@ -85,8 +87,11 @@ files:
 - lib/ruby-next/core/hash/deconstruct_keys.rb
 - lib/ruby-next/core/hash/except.rb
 - lib/ruby-next/core/hash/merge.rb
+- lib/ruby-next/core/integer/try_convert.rb
 - lib/ruby-next/core/kernel/then.rb
+- lib/ruby-next/core/matchdata/match.rb
 - lib/ruby-next/core/proc/compose.rb
+- lib/ruby-next/core/refinement/import.rb
 - lib/ruby-next/core/runtime.rb
 - lib/ruby-next/core/string/split.rb
 - lib/ruby-next/core/struct/deconstruct.rb
@@ -99,27 +104,33 @@ files:
 - lib/ruby-next/core_ext.rb
 - lib/ruby-next/language.rb
 - lib/ruby-next/language/bootsnap.rb
-- lib/ruby-next/language/edge.rb
 - lib/ruby-next/language/eval.rb
 - 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/2.1/numeric_literals.rb
+- lib/ruby-next/language/rewriters/2.1/required_kwargs.rb
+- lib/ruby-next/language/rewriters/2.3/safe_navigation.rb
+- lib/ruby-next/language/rewriters/2.3/squiggly_heredoc.rb
+- lib/ruby-next/language/rewriters/2.4/dir.rb
+- lib/ruby-next/language/rewriters/2.6/endless_range.rb
+- lib/ruby-next/language/rewriters/2.7/args_forward.rb
+- lib/ruby-next/language/rewriters/2.7/numbered_params.rb
+- lib/ruby-next/language/rewriters/2.7/pattern_matching.rb
+- lib/ruby-next/language/rewriters/3.0/args_forward_leading.rb
+- lib/ruby-next/language/rewriters/3.0/endless_method.rb
+- lib/ruby-next/language/rewriters/3.0/find_pattern.rb
+- lib/ruby-next/language/rewriters/3.0/in_pattern.rb
+- lib/ruby-next/language/rewriters/3.1/anonymous_block.rb
+- lib/ruby-next/language/rewriters/3.1/endless_method_command.rb
+- lib/ruby-next/language/rewriters/3.1/oneline_pattern_parensless.rb
+- lib/ruby-next/language/rewriters/3.1/pin_vars_pattern.rb
+- lib/ruby-next/language/rewriters/3.1/refinement_import_methods.rb
+- lib/ruby-next/language/rewriters/3.1/shorthand_hash.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/numeric_literals.rb
-- lib/ruby-next/language/rewriters/pattern_matching.rb
-- lib/ruby-next/language/rewriters/required_kwargs.rb
+- lib/ruby-next/language/rewriters/edge.rb
+- lib/ruby-next/language/rewriters/proposed.rb
+- lib/ruby-next/language/rewriters/proposed/bind_vars_pattern.rb
+- lib/ruby-next/language/rewriters/proposed/method_reference.rb
 - lib/ruby-next/language/rewriters/runtime.rb
-- lib/ruby-next/language/rewriters/runtime/dir.rb
-- lib/ruby-next/language/rewriters/safe_navigation.rb
-- lib/ruby-next/language/rewriters/shorthand_hash.rb
-- lib/ruby-next/language/rewriters/squiggly_heredoc.rb
 - lib/ruby-next/language/runtime.rb
 - lib/ruby-next/language/setup.rb
 - lib/ruby-next/language/unparser.rb
@@ -153,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Ruby Next core functionality

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

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-# Load experimental, proposed etc. Ruby features
-
-require "ruby-next/language/rewriters/method_reference"
-RubyNext::Language.rewriters << RubyNext::Language::Rewriters::MethodReference
-
-require "ruby-next/language/rewriters/shorthand_hash"
-RubyNext::Language.rewriters << RubyNext::Language::Rewriters::ShorthandHash

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

@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-require "ruby-next/language/rewriters/pattern_matching"
-
-module RubyNext
-  module Language
-    module Rewriters
-      using RubyNext
-
-      # Separate pattern matching rewriter for Ruby 2.7 to
-      # transpile only `in` patterns
-      class InPattern < PatternMatching
-        NAME = "pattern-matching-in"
-        SYNTAX_PROBE = "1 in 2"
-        MIN_SUPPORTED_VERSION = Gem::Version.new("3.0.0")
-
-        # Make case-match no-op
-        def on_case_match(node)
-          node
-        end
-
-        def on_match_pattern_p(node)
-          context.track! self
-
-          @deconstructed_keys = {}
-          @predicates = Predicates::Noop.new
-
-          matchee =
-            s(:begin, s(:lvasgn, MATCHEE, node.children[0]))
-
-          pattern =
-            locals.with(
-              matchee: MATCHEE,
-              arr: MATCHEE_ARR,
-              hash: MATCHEE_HASH
-            ) do
-              send(
-                :"#{node.children[1].type}_clause",
-                node.children[1]
-              )
-            end
-
-          node.updated(
-            :and,
-            [
-              matchee,
-              pattern
-            ]
-          ).tap do |new_node|
-            replace(node.loc.expression, inline_blocks(unparse(new_node)))
-          end
-        end
-      end
-    end
-  end
-end