make ▒▒▒ much harder to encounter

Author: rokke-git

src/sparsematrix.jl

@@ -350,13 +350,17 @@ function Base.show(io::IO, ::MIME"text/plain", S::AbstractSparseMatrixCSCInclAdj
     summary(io, S)
     isempty(S) && return
 
-    screen = displaysize(io)
-    get(io, :limit, false) && screen[1] <= 4 && return print(io, ": …")
+    if get(io, :limit, false)
+        screen = get(io, :displaysize, displaysize(io))::Tuple{Int, Int}
+        screen[1] <= 4 && return print(io, ": …")
+    else
+        screen = typemax(Int), typemax(Int)
+    end
 
     show_circular(io, S) && return
     io = IOContext(io, :compact=>true, :typeinfo=>eltype(S), :SHOWN_SET=>S)
 
-    if (screen[1] < size(S, 1) + 4) | (screen[2] < 3size(S, 2))
+    if !get(io, :limit, false) || (screen[1] < size(S, 1) + 4) | (screen[2] < 3size(S, 2))
         _show_with_braille_patterns(io, S)
     else
         _show_with_dotted_zeros(io, S)
@@ -407,8 +411,11 @@ end
 const brailleBlocks = UInt16['⠁', '⠂', '⠄', '⡀', '⠈', '⠐', '⠠', '⢀']
 function _show_with_braille_patterns(io::IO, S::AbstractSparseMatrixCSCInclAdjointAndTranspose)
     # The maximum number of characters we allow to display the matrix
-    h, w = get(io, :limit, false) ? displaysize(io) .- (4, 2) : (typemax(Int)÷4, typemax(Int)÷2)
-    m, n = size(S)
+    h, w = if get(io, :limit, false)::Bool
+        get(io, :displysize, displaysize(io)) .- (4, 2)
+    else
+        typemax(Int)÷4, typemax(Int)÷2
+    end::Tuple{Int, Int}
 
     warn = false
     try
@@ -421,8 +428,8 @@ function _show_with_braille_patterns(io::IO, S::AbstractSparseMatrixCSCInclAdjoi
     # In order to prevent aliasing, we only scale down by full integers.
     # While 1 to 1/2 is a big jump, it's less noticeable as you get bigger.
     # Note each character has 4 dots of height and 2 dots of width.
-    scale = max(n÷2w, m÷4h) + 1
-    char_h, char_w = fld1(m, 4scale), fld1(n, 2scale)
+    scale = maximum(cld.(size(S), (4h, 2w)))
+    char_h, char_w = cld.(size(S), (4scale, 2scale))
 
     scale != 1 && print(io, " (displaying at 1/$scale scale)")
     println(io, ":")
@@ -439,12 +446,12 @@ function _show_with_braille_patterns(io::IO, S::AbstractSparseMatrixCSCInclAdjoi
 
     if S isa AbstractSparseMatrixCSC
         for cords in zip(rinds, cinds)
-            row, col = fld1.(cords, scale) |>x-> fldmod1.(x, (4, 2))
+            row, col = cld.(cords, scale) |>x-> fldmod1.(x, (4, 2))
             brailleGrid[col[1]+1, row[1]] |= brailleBlocks[row[2] + 4(col[2]-1)]
         end
     else # swap rows / cols for adj and transpose
         for cords in zip(rinds, cinds)
-            col, row = fld1.(cords, scale) |>x-> fldmod1.(x, (2, 4))
+            col, row = cld.(cords, scale) |>x-> fldmod1.(x, (2, 4))
             brailleGrid[col[1]+1, row[1]] |= brailleBlocks[row[2] + 4(col[2]-1)]
         end
     end
@@ -457,7 +464,7 @@ function _show_with_dotted_zeros(io::IO, S::AbstractSparseMatrixCSCInclAdjointAn
     (S isa Adjoint) | (S isa Transpose) && ((rows, cols) = (cols, rows))
 
     align = [isassigned(vals, ind) ? alignment(io, vals[ind]) : (3, 3) for ind in eachindex(vals)]
-    colwidths = [max.((0, 0), align[findall(==(col), cols)]...) for col in axes(S,2)]
+    colwidths = [maximum.((first,last), Ref(align[findall(==(col), cols)]);init=0) for col in axes(S,2)]
     displaysize(io)[2] < sum(sum.(colwidths) .+ 2) && return _show_with_braille_patterns(io, S)
 
     println(io, ":")
@@ -476,26 +483,25 @@ function _show_with_dotted_zeros(io::IO, S::AbstractSparseMatrixCSCInclAdjointAn
             if isempty(index) # no value here, print an aligned dot
                 l, r = cld(l+r-1, 2) + 1, div(l+r-1, 2) + 1
                 print(io, " "^l * "⋅" * (col==axes(S,2)[end] ? "" : " "^r))
-            else try # print the element with 1 space of buffer on each side
+            elseif length(index) == 1 # print the element with 1 space of buffer on each side
                 l, r = (l+1, r+1) .- align[index[]]
                 print(io, " "^l)
                 isassigned(vals, index[]) ? show(io, vals[index[]]) : print(io, "#undef")
                 col == axes(S,2)[end] || print(io, " "^r)
-            catch # if there's 2+ entries, index[] errors. default to summing
-                  # entries, but print red to warn user that something's wrong
+            else # default to summing entries, but print red to warn user that something's wrong
                 elm = any(!isassigned(vals, ind) for ind in index) ? "#undef" :
-                    try repr(sum(vals[index]); context=:compact=>true) catch e "#NaN" end
+                    try repr(sum(vals[index]); context=io) catch e "#NaN" end
 
-                if length(elm) <= l+r # give up on alignment, center item in the column
-                    l, r = cld(l+r-length(elm), 2) + 1, div(l+r-length(elm), 2) + 1
-                else # len of new item does not fit in column
+                l, r = if textwidth(elm) <= l+r+2 # give up on alignment, just center item
+                    cld(l+r-textwidth(elm), 2) + 1, fld(l+r-textwidth(elm), 2) + 1
+                else # new item does not fit in column
                     elm = "▒"^(l+r)
-                    l, r = 1, 1
+                    1, 1
                 end
 
                 printstyled(io, " "^l, elm, color=:red)
                 col == axes(S,2)[end] || print(io, " "^r)
-            end end
+            end
         end
         row == axes(S,1)[end] || println(io)
     end

test/issues.jl

@@ -759,14 +759,14 @@ let
     @test repr(B) == "sparse([1, 2, 3], [1, 2, 3], $T12960[#undef, #undef, #undef], 3, 3)"
     @test occursin(
         " #undef     ⋅       ⋅\n    ⋅    #undef     ⋅\n    ⋅       ⋅    #undef",
-        repr(MIME("text/plain"), B),
+        sprint(show, MIME("text/plain"), B; context=:limit=>true),
     )
 
     B[1,2] = T12960()
     @test repr(B)  == "sparse([1, 1, 2, 3], [1, 2, 2, 3], $T12960[#undef, $T12960(), #undef, #undef], 3, 3)"
     @test occursin(
         "\n #undef     T12960()     ⋅\n    ⋅    #undef          ⋅\n    ⋅         ⋅       #undef",
-        repr(MIME("text/plain"), B),
+        sprint(show, MIME("text/plain"), B; context=:limit=>true),
     )
 end
 
@@ -823,14 +823,16 @@ end
 
 @testset "Issue #618" begin
     x = SparseMatrixCSC(3, 3, [1, 3, 4, 5], [1, 1, 2, 3], [1.0, 1.0, 1.0, 1.0])
-    @test contains(repr(MIME"text/plain"(), x), "2.0")
-    x = SparseMatrixCSC(3, 3, [1, 3, 4, 5], [1, 1, 2, 3], [7.0, 7.0, 1.0, 1.0])
-    @test contains(repr(MIME"text/plain"(), x), "▒▒▒")
+    @test contains(sprint(show, MIME"text/plain"(), x; context=:limit=>true), "2.0")
+    x = SparseMatrixCSC(11, 11, [1; 112; 113; [114 for i=1:9]], [[1 for i=1:111]; 2; 3], [[9 for i=1:111]; 1; 1.])
+    @test !contains(sprint(show, MIME"text/plain"(), x; context=:limit=>true), "▒▒▒")
+    x = SparseMatrixCSC(11, 11, [1; 113; 114; [115 for i=1:9]], [[1 for i=1:112]; 2; 3], [[9 for i=1:112]; 1; 1.])
+    @test contains(sprint(show, MIME"text/plain"(), x; context=:limit=>true), "▒▒▒")
     x = SparseMatrixCSC(3, 3, [1, 3, 4, 5], [1, 1, 2, 3], [7.0, 'o', 1.0, 1.0])
-    @test contains(repr(MIME"text/plain"(), x), "#NaN")
+    @test contains(sprint(show, MIME"text/plain"(), x; context=:limit=>true), "#NaN")
     v = similar(Any[1, 2, 3, 4]); v[2:4] = [1.0, 1.0, 1.0]
     x = SparseMatrixCSC(3, 3, [1, 3, 4, 5], [1, 1, 2, 3], v)
-    @test contains(repr(MIME"text/plain"(), x), "#undef")
+    @test contains(sprint(show, MIME"text/plain"(), x; context=:limit=>true), "#undef")
 
     x = SparseMatrixCSC(3, 3, [1, 3, 4, 5], [1, 1, 2, 3], [1, 1, 1, 1])
     @test 2 == Matrix(x)[1,1]

test/sparsematrix_constructors_indexing.jl

@@ -1488,6 +1488,7 @@ end
 
 @testset "show" begin
     io = IOBuffer()
+    repl = IOContext(io, :limit=>true)
 
     A = spzeros(Float64, Int64, 0, 0)
     for (transform, showstring) in zip(
@@ -1496,7 +1497,7 @@ end
         "0×0 $Adjoint{Float64, $SparseMatrixCSC{Float64, Int64}} with 0 stored entries",
         "0×0 $Transpose{Float64, $SparseMatrixCSC{Float64, Int64}} with 0 stored entries"
         ))
-        show(io, MIME"text/plain"(), transform(A))
+        show(repl , MIME"text/plain"(), transform(A))
         @test String(take!(io)) == showstring
     end
 
@@ -1507,7 +1508,7 @@ end
         "1×1 $Adjoint{Float64, $SparseMatrixCSC{Float64, Int64}} with 1 stored entry:\n 1.0",
         "1×1 $Transpose{Float64, $SparseMatrixCSC{Float64, Int64}} with 1 stored entry:\n 1.0",
         ))
-        show(io, MIME"text/plain"(), transform(A))
+        show(repl , MIME"text/plain"(), transform(A))
         @test String(take!(io)) == showstring
     end
 
@@ -1518,7 +1519,7 @@ end
         "2×2 $Adjoint{Float32, $SparseMatrixCSC{Float32, Int64}} with 0 stored entries:\n ⋅  ⋅\n ⋅  ⋅",
         "2×2 $Transpose{Float32, $SparseMatrixCSC{Float32, Int64}} with 0 stored entries:\n ⋅  ⋅\n ⋅  ⋅",
         ))
-        show(io, MIME"text/plain"(), transform(A))
+        show(repl , MIME"text/plain"(), transform(A))
         @test String(take!(io)) == showstring
     end
 
@@ -1530,7 +1531,7 @@ end
         "2×1 $Transpose{Float64, $SparseMatrixCSC{Float64, Int64}} with 2 stored entries:\n 1.0\n 2.0",
         ),
         ("\n[⠉]", "\n[⠃]", "\n[⠃]"))
-        show(io, MIME"text/plain"(), transform(A))
+        show(repl , MIME"text/plain"(), transform(A))
         @test String(take!(io)) == showstring
         _show_with_braille_patterns(convert(IOContext, io), transform(A))
         @test contains(String(take!(io)), braille)
@@ -1565,7 +1566,7 @@ end
         "2×4 $Transpose{Int64, $SparseMatrixCSC{Int64, Int64}} with 5 stored entries:\n 1  1  ⋅  1\n ⋅  1  1  ⋅",
         ),
         ("\n[⡳]", "\n[⠙⠊]", "\n[⠙⠊]"))
-        show(io, MIME"text/plain"(), transform(A))
+        show(repl , MIME"text/plain"(), transform(A))
         @test String(take!(io)) == showstring
         _show_with_braille_patterns(convert(IOContext, io), transform(A))
         @test contains(String(take!(io)), braille)
@@ -1582,7 +1583,7 @@ end
          "⎣⠀⠀⎦",
          "[⠑⠑⠀⠀]",
          "[⠑⠑⠀⠀]"))
-        show(io, MIME"text/plain"(), transform(A))
+        show(repl , MIME"text/plain"(), transform(A))
         @test String(take!(io)) == showstring
         _show_with_braille_patterns(convert(IOContext, io), transform(A))
         @test contains(String(take!(io)), braille)
@@ -1598,7 +1599,7 @@ end
     end
 
     # Issue #30589
-    @test repr("text/plain", sparse([true true])) == "1×2 $SparseMatrixCSC{Bool, $Int} with 2 stored entries:\n 1  1"
+    @test sprint(show, "text/plain", sparse([true true]); context=:limit=>true) == "1×2 $SparseMatrixCSC{Bool, $Int} with 2 stored entries:\n 1  1"
 
     function _filled_sparse(m::Integer, n::Integer)
         C = CartesianIndices((m, n))[:]
@@ -1618,7 +1619,7 @@ end
     # horizontal scaling
     ioc = IOContext(io, :displaysize => (80, 4), :limit => true)
     _show_with_braille_patterns(ioc, _filled_sparse(8, 8))
-    @test contains(String(take!(io)), "\n[⠿⠇]")
+    @test contains(String(take!(io)), "\n[⣿⣿]")
 
     _show_with_braille_patterns(ioc, _filled_sparse(8, 16))
     @test contains(String(take!(io)), "\n[⠛⠛]")