ruby-next-core 0.9.2 → 0.10.4

data/lib/ruby-next/core/enumerable/filter_map.rb

@@ -3,36 +3,36 @@
 # Refine Array seprately, 'cause refining modules is vulnerable to prepend:
 # - https://bugs.ruby-lang.org/issues/13446
 RubyNext::Core.patch Enumerable, method: :filter_map, version: "2.7", refineable: [Enumerable, Array] do
-  <<~RUBY
-    def filter_map
-      if block_given?
-        result = []
-        each do |element|
-          res = yield element
-          result << res if res
-        end
-        result
-      else
-        Enumerator.new do |yielder|
-          result = []
-          each do |element|
-            res = yielder.yield element
-            result << res if res
-          end
-          result
-        end
+  <<-RUBY
+def filter_map
+  if block_given?
+    result = []
+    each do |element|
+      res = yield element
+      result << res if res
+    end
+    result
+  else
+    Enumerator.new do |yielder|
+      result = []
+      each do |element|
+        res = yielder.yield element
+        result << res if res
       end
+      result
     end
+  end
+end
   RUBY
 end
 
 RubyNext::Core.patch Enumerator::Lazy, method: :filter_map, version: "2.7" do
-  <<~RUBY
-    def filter_map
-      Enumerator::Lazy.new(self) do |yielder, *values|
-        result = yield(*values)
-        yielder << result if result
-      end
-    end
+  <<-RUBY
+def filter_map
+  Enumerator::Lazy.new(self) do |yielder, *values|
+    result = yield(*values)
+    yielder << result if result
+  end
+end
   RUBY
 end

data/lib/ruby-next/core/enumerable/tally.rb

@@ -3,12 +3,12 @@
 # Refine Array seprately, 'cause refining modules is vulnerable to prepend:
 # - https://bugs.ruby-lang.org/issues/13446
 RubyNext::Core.patch Enumerable, method: :tally, version: "2.7", refineable: [Enumerable, Array] do
-  <<~RUBY
-    def tally
-      each_with_object({}) do |v, acc|
-        acc[v] ||= 0
-        acc[v] += 1
-      end
-    end
+  <<-RUBY
+def tally
+  each_with_object({}) do |v, acc|
+    acc[v] ||= 0
+    acc[v] += 1
+  end
+end
   RUBY
 end

data/lib/ruby-next/core/enumerator/produce.rb

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 
 RubyNext::Core.patch Enumerator.singleton_class, method: :produce, singleton: Enumerator, version: "2.7" do
-  <<~'RUBY'
-    # Based on https://github.com/zverok/enumerator_generate
-    def produce(*rest, &block)
-      raise ArgumentError, "wrong number of arguments (given #{rest.size}, expected 0..1)" if rest.size > 1
-      raise ArgumentError, "No block given" unless block
+  <<-'RUBY'
+# Based on https://github.com/zverok/enumerator_generate
+def produce(*rest, &block)
+  raise ArgumentError, "wrong number of arguments (given #{rest.size}, expected 0..1)" if rest.size > 1
+  raise ArgumentError, "No block given" unless block
 
-      Enumerator.new(Float::INFINITY) do |y|
-        val = rest.empty? ? yield() : rest.pop
+  Enumerator.new(Float::INFINITY) do |y|
+    val = rest.empty? ? yield() : rest.pop
 
-        loop do
-          y << val
-          val = yield(val)
-        end
-      end
+    loop do
+      y << val
+      val = yield(val)
     end
+  end
+end
   RUBY
 end

data/lib/ruby-next/core/hash/deconstruct_keys.rb

@@ -1,21 +1,21 @@
 # frozen_string_literal: true
 
 RubyNext::Core.patch Hash, method: :deconstruct_keys, version: "2.7" do
-  <<~RUBY
-    def deconstruct_keys(_)
-      self
-    end
+  <<-RUBY
+def deconstruct_keys(_)
+  self
+end
   RUBY
 end
 
 # We need to hack `respond_to?` in Ruby 2.5, since it's not working with refinements
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6")
   RubyNext::Core.patch refineable: Hash, name: "HashRespondToDeconstructKeys", method: :deconstruct_keys, version: "2.7" do
-    <<~RUBY
-      def respond_to?(mid, *)
-        return true if mid == :deconstruct_keys
-        super
-      end
+    <<-RUBY
+def respond_to?(mid, *)
+  return true if mid == :deconstruct_keys
+  super
+end
     RUBY
   end
 end

data/lib/ruby-next/core/hash/except.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+RubyNext::Core.patch Hash, method: :except, version: "3.0" do
+  <<-RUBY
+def except(*keys)
+  self.dup.tap do |new_hash|
+    keys.each { |k| new_hash.delete(k) }
+  end
+end
+  RUBY
+end

data/lib/ruby-next/core/hash/merge.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 RubyNext::Core.patch Hash, method: :merge, version: "2.6", supported: {}.method(:merge).arity < 0, core_ext: :prepend do
-  <<~RUBY
-    def merge(*others)
-      return super if others.size == 1
-      return dup if others.size == 0
+  <<-RUBY
+def merge(*others)
+  return super if others.size == 1
+  return dup if others.size == 0
 
-      merge(others.shift).tap do |new_h|
-        others.each { |h| new_h.merge!(h) }
-      end
-    end
+  merge(others.shift).tap do |new_h|
+    others.each { |h| new_h.merge!(h) }
+  end
+end
   RUBY
 end

data/lib/ruby-next/core/kernel/then.rb

@@ -4,7 +4,7 @@
 # - https://bugs.ruby-lang.org/issues/13446
 # - Rails added `Kernel.prepend` in 6.1: https://github.com/rails/rails/commit/3124007bd674dcdc9c3b5c6b2964dfb7a1a0733c
 RubyNext::Core.patch Kernel, method: :then, version: "2.6", refineable: Object do
-  <<~RUBY
-    alias then yield_self
+  <<-RUBY
+alias then yield_self
   RUBY
 end

data/lib/ruby-next/core/proc/compose.rb

@@ -2,18 +2,18 @@
 
 # rubocop:disable Style/LambdaCall
 RubyNext::Core.patch Proc, name: "ProcCompose", method: :<<, version: "2.6" do
-  <<~RUBY
-    def <<(other)
-      raise TypeError, "callable object is expected" unless other.respond_to?(:call)
-      this = self
-      proc { |*args, &block| this.(other.(*args, &block)) }
-    end
+  <<-RUBY
+def <<(other)
+  raise TypeError, "callable object is expected" unless other.respond_to?(:call)
+  this = self
+  proc { |*args, &block| this.(other.(*args, &block)) }
+end
 
-    def >>(other)
-      raise TypeError, "callable object is expected" unless other.respond_to?(:call)
-      this = self
-      proc { |*args, &block| other.(this.(*args, &block)) }
-    end
+def >>(other)
+  raise TypeError, "callable object is expected" unless other.respond_to?(:call)
+  this = self
+  proc { |*args, &block| other.(this.(*args, &block)) }
+end
   RUBY
 end
 # rubocop:enable Style/LambdaCall

data/lib/ruby-next/core/string/split.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 RubyNext::Core.patch String, method: :split, version: "2.6", supported: ("a b".split(" ", &proc {}) == "a b"), core_ext: :prepend do
-  <<~RUBY
-    def split(*args, &block)
-      return super unless block_given?
-      super.each { |el| yield el }
-      self
-    end
+  <<-RUBY
+def split(*args, &block)
+  return super unless block_given?
+  super.each { |el| yield el }
+  self
+end
   RUBY
 end

data/lib/ruby-next/core/struct/deconstruct.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RubyNext::Core.patch Struct, method: :deconstruct, version: "2.7" do
-  <<~'RUBY'
-    alias deconstruct to_a
+  <<-RUBY
+alias deconstruct to_a
   RUBY
 end

data/lib/ruby-next/core/struct/deconstruct_keys.rb

@@ -2,31 +2,31 @@
 
 # Source: https://github.com/ruby/ruby/blob/b76a21aa45fff75909a66f8b20fc5856705f7862/struct.c#L953-L980
 RubyNext::Core.patch Struct, method: :deconstruct_keys, version: "2.7" do
-  <<~'RUBY'
-    def deconstruct_keys(keys)
-      raise TypeError, "wrong argument type #{keys.class} (expected Array or nil)" if keys && !keys.is_a?(Array)
+  <<-'RUBY'
+def deconstruct_keys(keys)
+  raise TypeError, "wrong argument type #{keys.class} (expected Array or nil)" if keys && !keys.is_a?(Array)
 
-      return to_h unless keys
+  return to_h unless keys
 
-      keys.each_with_object({}) do |k, acc|
-        # if k is Symbol and not a member of a Struct return {}
-        next if (Symbol === k || String === k) && !members.include?(k.to_sym)
-        # if k is Integer check that index is not ouf of bounds
-        next if Integer === k && k > size - 1
-        acc[k] = self[k]
-      end
-    end
+  keys.each_with_object({}) do |k, acc|
+    # if k is Symbol and not a member of a Struct return {}
+    next if (Symbol === k || String === k) && !members.include?(k.to_sym)
+    # if k is Integer check that index is not ouf of bounds
+    next if Integer === k && k > size - 1
+    acc[k] = self[k]
+  end
+end
   RUBY
 end
 
 # We need to hack `respond_to?` in Ruby 2.5, since it's not working with refinements
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6")
   RubyNext::Core.patch refineable: Struct, name: "StructRespondToDeconstruct", method: :deconstruct_keys, version: "2.7" do
-    <<~RUBY
-      def respond_to?(mid, *)
-        return true if mid == :deconstruct_keys || mid == :deconstruct
-        super
-      end
+    <<-RUBY
+def respond_to?(mid, *)
+  return true if mid == :deconstruct_keys || mid == :deconstruct
+  super
+end
     RUBY
   end
 end

data/lib/ruby-next/core/symbol/end_with.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 RubyNext::Core.patch Symbol, method: :end_with?, version: "2.7" do
-  <<~RUBY
-    def end_with?(*prefixes)
-      to_s.end_with?(*prefixes)
-    end
+  <<-RUBY
+def end_with?(*prefixes)
+  to_s.end_with?(*prefixes)
+end
   RUBY
 end

data/lib/ruby-next/core/symbol/start_with.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 RubyNext::Core.patch Symbol, method: :start_with?, version: "2.7" do
-  <<~RUBY
-    def start_with?(*prefixes)
-      to_s.start_with?(*prefixes)
-    end
+  <<-RUBY
+def start_with?(*prefixes)
+  to_s.start_with?(*prefixes)
+end
   RUBY
 end

data/lib/ruby-next/core/time/ceil.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 RubyNext::Core.patch Time, method: :ceil, version: "2.7" do
-  <<~'RUBY'
-    def ceil(den = 0)
-      sceil = (subsec * 10**den).ceil.to_r / 10**den
-      change = sceil - subsec
-      self + change
-    end
+  <<-RUBY
+def ceil(den = 0)
+  sceil = (subsec * 10**den).ceil.to_r / 10**den
+  change = sceil - subsec
+  self + change
+end
   RUBY
 end

data/lib/ruby-next/core/time/floor.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 RubyNext::Core.patch Time, method: :floor, version: "2.7" do
-  <<~'RUBY'
-    def floor(den = 0)
-      self - (subsec % (10**-den))
-    end
+  <<-RUBY
+def floor(den = 0)
+  self - (subsec % (10**-den))
+end
   RUBY
 end

data/lib/ruby-next/core/unboundmethod/bind_call.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 RubyNext::Core.patch UnboundMethod, method: :bind_call, version: "2.7" do
-  <<~'RUBY'
-    def bind_call(receiver, *args, &block)
-      bind(receiver).call(*args, &block)
-    end
+  <<-RUBY
+def bind_call(receiver, *args, &block)
+  bind(receiver).call(*args, &block)
+end
   RUBY
 end

data/lib/ruby-next/core_ext.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "core"
+require "ruby-next/core"
 
 # Monkey-patch core classes using the same patches as for refinements
 RubyNext::Core.patches.extensions.each do |mod, patches|

data/lib/ruby-next/language.rb

@@ -100,7 +100,7 @@ module RubyNext
         else
           regenerate(*args, **kwargs)
         end
-      rescue Unparser::UnknownEmitterError
+      rescue Unparser::UnknownNodeError
         if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.7.0")
           RubyNext.warn "Ruby Next fallbacks to \"rewrite\" transpiling mode since Unparser doesn't support 2.7+ AST yet.\n" \
             "See https://github.com/mbj/unparser/pull/142"
@@ -173,6 +173,12 @@ module RubyNext
 
     require "ruby-next/language/rewriters/base"
 
+    require "ruby-next/language/rewriters/squiggly_heredoc"
+    rewriters << Rewriters::SquigglyHeredoc
+
+    require "ruby-next/language/rewriters/safe_navigation"
+    rewriters << Rewriters::SafeNavigation
+
     require "ruby-next/language/rewriters/args_forward"
     rewriters << Rewriters::ArgsForward
 
@@ -182,6 +188,11 @@ module RubyNext
     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"
+    rewriters << Rewriters::FindPattern
+
     # Put endless range in the end, 'cause Parser fails to parse it in
     # pattern matching
     require "ruby-next/language/rewriters/endless_range"

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

@@ -6,9 +6,6 @@ module RubyNext
   module Language
     class Builder < ::Parser::Builders::Default
       modernize
-
-      # FIXME: add support for 2.8 forward args
-      self.emit_forward_arg = false
     end
 
     class << self

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

@@ -4,3 +4,6 @@
 
 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/args_forward.rb

@@ -5,16 +5,18 @@ module RubyNext
     module Rewriters
       class ArgsForward < Base
         NAME = "args-forward"
-        SYNTAX_PROBE = "obj = Object.new; def obj.foo(...) super(...); end"
-        MIN_SUPPORTED_VERSION = Gem::Version.new("2.7.0")
+        SYNTAX_PROBE = "obj = Object.new; def obj.foo(...) super(1, ...); end"
+        MIN_SUPPORTED_VERSION = Gem::Version.new("3.0.0")
 
         REST = :__rest__
         BLOCK = :__block__
 
-        def on_forward_args(node)
+        def on_forward_arg(node)
           context.track! self
 
-          replace(node.loc.expression, "(*#{REST}, &#{BLOCK})")
+          node = super(node)
+
+          replace(node.loc.expression, "*#{REST}, &#{BLOCK}")
 
           node.updated(
             :args,
@@ -26,34 +28,35 @@ module RubyNext
         end
 
         def on_send(node)
-          return super(node) unless node.children[2]&.type == :forwarded_args
+          fargs = node.children.find { |child| child.is_a?(::Parser::AST::Node) && child.type == :forwarded_args }
+          return super(node) unless fargs
+
+          process_fargs(node, fargs)
+        end
+
+        def on_super(node)
+          fargs = node.children.find { |child| child.is_a?(::Parser::AST::Node) && child.type == :forwarded_args }
+          return super(node) unless fargs
+
+          process_fargs(node, fargs)
+        end
+
+        private
 
-          replace(node.children[2].loc.expression, "*#{REST}, &#{BLOCK}")
+        def process_fargs(node, fargs)
+          replace(fargs.loc.expression, "*#{REST}, &#{BLOCK}")
 
           process(
             node.updated(
               nil,
               [
-                *node.children[0..1],
+                *node.children.take(node.children.index(fargs)),
                 *forwarded_args
               ]
             )
           )
         end
 
-        def on_super(node)
-          return super(node) unless node.children[0]&.type == :forwarded_args
-
-          replace(node.children[0].loc.expression, "*#{REST}, &#{BLOCK}")
-
-          node.updated(
-            nil,
-            forwarded_args
-          )
-        end
-
-        private
-
         def forwarded_args
           [
             s(:splat, s(:lvar, REST)),