Show type for IdOffsetRange (#143)

Display an `IdOffsetRange` using its type, except in the summary of an OffsetArray

Author: jishnub

src/OffsetArrays.jl

@@ -299,21 +299,19 @@ indexlength(r::AbstractRange) = length(r)
 indexlength(i::Integer) = i
 indexlength(i::Colon) = Colon()
 
+# These functions keep the summary compact
+function Base.inds2string(inds::Tuple{Vararg{Union{IdOffsetRange, IdentityUnitRange{<:IdOffsetRange}}}})
+    Base.inds2string(map(UnitRange, inds))
+end
+Base.showindices(io::IO, ind1::IdOffsetRange, inds::IdOffsetRange...) = Base.showindices(io, map(UnitRange, (ind1, inds...))...)
+    
 function Base.showarg(io::IO, a::OffsetArray, toplevel)
     print(io, "OffsetArray(")
     Base.showarg(io, parent(a), false)
-    if ndims(a) > 0
-        print(io, ", ")
-        printindices(io, axes(a)...)
-    end
+    Base.showindices(io, axes(a)...)
     print(io, ')')
     toplevel && print(io, " with eltype ", eltype(a))
 end
-printindices(io::IO, ind1, inds...) =
-    (print(io, _unslice(ind1), ", "); printindices(io, inds...))
-printindices(io::IO, ind1) = print(io, _unslice(ind1))
-_unslice(x) = x
-_unslice(x::IdentityUnitRange) = x.indices
 
 function Base.replace_in_print_matrix(A::OffsetArray{<:Any,2}, i::Integer, j::Integer, s::AbstractString)
     J = map(parentindex, axes(A), (i,j))

src/axes.jl

@@ -163,7 +163,7 @@ Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(+), r::IdO
 Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(+), x::Integer, r::IdOffsetRange{T}) where T =
     IdOffsetRange{T}(x .+ r.parent, r.offset)
 
-Base.show(io::IO, r::IdOffsetRange) = print(io, first(r), ':', last(r))
+Base.show(io::IO, r::IdOffsetRange) = print(io, "OffsetArrays.IdOffsetRange(",first(r), ':', last(r),")")
 
 # Optimizations
 @inline Base.checkindex(::Type{Bool}, inds::IdOffsetRange, i::Real) = Base.checkindex(Bool, inds.parent, i - inds.offset)

test/runtests.jl

@@ -502,15 +502,32 @@ end
     a = OffsetArray(reshape([1]))
     @test summary(a) == "0-dimensional OffsetArray(::$(typeof(parent(a)))) with eltype $(Int)"
 
+    a = OffsetArray([1 2; 3 4], -1:0, 5:6)
+    io = IOBuffer()
+    show(io, axes(a, 1))
+    @test String(take!(io)) == "OffsetArrays.IdOffsetRange(-1:0)"
+    show(io, axes(a, 2))
+    @test String(take!(io)) == "OffsetArrays.IdOffsetRange(5:6)"
+
+    @test Base.inds2string(axes(a)) == Base.inds2string(map(UnitRange, axes(a)))
+
     show(io, OffsetArray(3:5, 0:2))
     @test String(take!(io)) == "3:5 with indices 0:2"
 
     d = Diagonal([1,2,3])
     Base.print_array(io, d)
     s1 = String(take!(io))
-    Base.print_array(io, OffsetArray(d, -1:1, 3:5))
+    od = OffsetArray(d, -1:1, 3:5)
+    Base.print_array(io, od)
     s2 = String(take!(io))
     @test s1 == s2
+
+    @test Base.replace_in_print_matrix(od, -1, 3, " ") == Base.replace_in_print_matrix(d, 1, 1, " ")
+    @test Base.replace_in_print_matrix(od, -1, 4, " ") == Base.replace_in_print_matrix(d, 1, 2, " ")
+
+    v = rand(3)
+    ov = OffsetArray(v, (-2,))
+    @test Base.replace_in_print_matrix(ov, -1, 1, " ") == Base.replace_in_print_matrix(v, 1, 1, " ")
 end
 
 @testset "readdlm/writedlm" begin