From 478ad9193e0f9d80ac5f08fbc405c8babf50584c Mon Sep 17 00:00:00 2001
From: ksss <co000ri@gmail.com>
Date: Sun, 14 Apr 2024 22:59:11 +0900
Subject: [PATCH 1/2] Fix block return type

---
 core/enumerator.rbs            |  2 +-
 test/stdlib/Enumerator_test.rb | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/core/enumerator.rbs b/core/enumerator.rbs
index b3ae0bd24..30b32d46f 100644
--- a/core/enumerator.rbs
+++ b/core/enumerator.rbs
@@ -293,7 +293,7 @@ class Enumerator[unchecked out Elem, out Return] < Object
   # lazy fashion (see Enumerator#size). It can either be a value or a callable
   # object.
   #
-  def initialize: (?Integer arg0) { (Enumerator::Yielder arg0) -> void } -> void
+  def initialize: (?Integer arg0) { (Enumerator::Yielder arg0) -> Return } -> void
 
   # <!--
   #   rdoc-file=enumerator.c
diff --git a/test/stdlib/Enumerator_test.rb b/test/stdlib/Enumerator_test.rb
index edf0a327f..3d5e87174 100644
--- a/test/stdlib/Enumerator_test.rb
+++ b/test/stdlib/Enumerator_test.rb
@@ -18,6 +18,12 @@ def test_with_object
     assert_send_type "(String) -> Enumerator[[Integer, String], String]", g, :with_object, ''
     assert_send_type "(String) { (Integer, String) -> untyped } -> String", g, :with_object, '' do end
   end
+
+  def test_each
+    enum = Enumerator.new { [1,2,3] }
+    assert_send_type "() { (Integer) -> nil } -> [1,2,3]",
+                     enum, :each do end
+  end
 end
 
 class EnumeratorSingletonTest < Test::Unit::TestCase
@@ -25,6 +31,11 @@ class EnumeratorSingletonTest < Test::Unit::TestCase
 
   testing "singleton(::Enumerator)"
 
+  def test_new
+    assert_send_type "() { (Enumerator::Yielder) -> 12345 } -> void",
+                     Enumerator, :new do 12345 end
+  end
+
   def test_produce
     assert_send_type(
       "(Integer initial) { (Integer) -> Integer } -> Enumerator[Integer, bot]",

From e8ee1023dae186b6342d156216aae69fd3844f7a Mon Sep 17 00:00:00 2001
From: Yuki Kurihara <co000ri@gmail.com>
Date: Mon, 15 Apr 2024 22:44:00 +0900
Subject: [PATCH 2/2] Update test/stdlib/Enumerator_test.rb

Co-authored-by: Soutaro Matsumoto <matsumoto@soutaro.com>
---
 test/stdlib/Enumerator_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/stdlib/Enumerator_test.rb b/test/stdlib/Enumerator_test.rb
index 3d5e87174..744bb4b63 100644
--- a/test/stdlib/Enumerator_test.rb
+++ b/test/stdlib/Enumerator_test.rb
@@ -32,7 +32,7 @@ class EnumeratorSingletonTest < Test::Unit::TestCase
   testing "singleton(::Enumerator)"
 
   def test_new
-    assert_send_type "() { (Enumerator::Yielder) -> 12345 } -> void",
+    assert_send_type "() { (Enumerator::Yielder) -> 12345 } -> Enumerator[untyped, 12345]",
                      Enumerator, :new do 12345 end
   end