delegate.rb: fixed keyword arguments in DelegateClass

`Delegator.delegating_block` should delegate keyword arguments
separately.  [ruby-core:96949]

(cherry picked from commit 9bcf4f3db26249772c983896ebbc9ff41f4614db)

2 files changed, 9 insertions, 1 deletions

diff --git a/lib/delegate.rb b/lib/delegate.rb
index 8c176dc82c..63657646e1 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -334,7 +334,7 @@ def Delegator.delegating_block(mid) # :nodoc:
   lambda do |*args, &block|
     target = self.__getobj__
     target.__send__(mid, *args, &block)
-  end
+  end.ruby2_keywords
 end
 
 #
diff --git a/test/test_delegate.rb b/test/test_delegate.rb
index 02a343358f..5660adc590 100644
--- a/test/test_delegate.rb
+++ b/test/test_delegate.rb
@@ -330,4 +330,12 @@ class TestDelegateClass < Test::Unit::TestCase
     assert_equal(1, delegate.bar)
     assert_raise(NoMethodError, /undefined method `foo' for/) { delegate.foo }
   end
+
+  def test_keyword_argument
+    k = EnvUtil.labeled_class("Target") do
+      def test(a, k:) [a, k]; end
+    end
+    a = DelegateClass(k).new(k.new)
+    assert_equal([1, 0], a.test(1, k: 0))
+  end
 end