Merge pull request #176 from jw3126/phg/slicing

Author: phipsgabler

Project.toml

@@ -1,6 +1,6 @@
 name = "Setfield"
 uuid = "efcf1570-3423-57d1-acb7-fd33fddbac46"
-version = "1.1.0"
+version = "1.1.1"
 
 [deps]
 ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"

src/setindex.jl

@@ -3,12 +3,14 @@ Base.@propagate_inbounds function setindex(args...)
 end
 
 Base.@propagate_inbounds function setindex(xs::AbstractArray, v, I...)
-    T = promote_type(eltype(xs), typeof(v))
+    # we need to distinguish between scalar and sliced assignment
+    I_normalized = Base.to_indices(xs, I)
+    T = promote_type(eltype(xs), I_normalized isa Tuple{Vararg{Integer}} ? typeof(v) : eltype(v))
     ys = similar(xs, T)
     if eltype(xs) !== Union{}
         copy!(ys, xs)
     end
-    ys[I...] = v
+    ys[I_normalized...] = v
     return ys
 end
 

test/test_setindex.jl

@@ -23,6 +23,9 @@ end
     @test @set(arr[1] = 10) == [10, 2, 3]
     @test arr == [1,2,3]
     @test Setfield.setindex(arr, 10.0, 1) ==ₜ Float64[10.0, 2.0, 3.0]
+    @test Setfield.setindex(ones(2, 2), zeros(2), 1, :) ==ₜ Float64[0.0 0.0; 1.0 1.0]
+    @test Setfield.setindex(ones(BigInt, 2, 2), zeros(Float32, 2), 1, :) ==ₜ BigFloat[0.0 0.0; 1.0 1.0]
+    @test Setfield.setindex(fill(ones(1), 2, 2), [im, im], :, 1) ==ₜ hcat([im, im], [[1.0], [1.0]])
 
     d = Dict(:a => 1, :b => 2)
     @test_throws MethodError Base.setindex(d, 10, :a)