Merge pull request #732 from pocke/Allow_Array____to_receive_Range_of…

…_optional_Integer Allow Array#[] to receive Range of optional Integer
ruby · Aug 10, 2021 · c09ab98 · c09ab98
2 parents 13f221f + 0589a5d
commit c09ab98
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/core/array.rbs b/core/array.rbs
@@ -452,7 +452,7 @@ class Array[unchecked out Elem] < Object
   #
   def []: (int index) -> Elem
         | (int start, int length) -> ::Array[Elem]?
-        | (::Range[::Integer] range) -> ::Array[Elem]?
+        | (::Range[::Integer?] range) -> ::Array[Elem]?
 
   # Element Assignment --- Sets the element at `index`, or replaces a subarray
   # from the `start` index for `length` elements, or replaces a subarray specified
@@ -486,9 +486,9 @@ class Array[unchecked out Elem] < Object
          | (int start, int length, Elem obj) -> Elem
          | (int start, int length, ::Array[Elem]) -> ::Array[Elem]
          | (int start, int length, nil) -> nil
-         | (::Range[::Integer], Elem obj) -> Elem
-         | (::Range[::Integer], ::Array[Elem]) -> ::Array[Elem]
-         | (::Range[::Integer], nil) -> nil
+         | (::Range[::Integer?], Elem obj) -> Elem
+         | (::Range[::Integer?], ::Array[Elem]) -> ::Array[Elem]
+         | (::Range[::Integer?], nil) -> nil
 
   # See also Enumerable#all?
   #

diff --git a/test/stdlib/Array_test.rb b/test/stdlib/Array_test.rb
@@ -102,6 +102,8 @@ def test_aref
                      [1,2,3], :[], 0...1
     assert_send_type "(Range[Integer]) -> nil",
                      [1,2,3], :[], 5..8
+    assert_send_type "(Range[Integer?]) -> Array[Integer]",
+                     [1,2,3], :[], 0...nil
   end
 
   def test_aupdate
@@ -121,6 +123,8 @@ def test_aupdate
                      [1,2,3], :[]=, 0...2, [-1]
     assert_send_type "(Range[Integer], nil) -> nil",
                      [1,2,3], :[]=, 0...2, nil
+    assert_send_type "(Range[Integer?], Integer) -> Integer",
+                     [1,2,3], :[]=, 0..nil, -1
   end
 
   def test_all?