show: fix double-width char display (#427)

JuliaStats · Jul 10, 2019 · 020214f · 020214f
1 parent 7447c93
commit 020214f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/timearray.jl b/src/timearray.jl
@@ -262,7 +262,7 @@ function print_time_array(io::IO, ta::TimeArray{T}, short=false) where T
         ## e.g. | Open  | High  | Low   | Close  |
         print(io, "│", " "^(spacetime + 2))
         for (name, w) in zip(colnames(ta)[p], colwidth[p])
-            print(io, "│ ", rpad(name, w + 1))
+            print(io, "│ ", _rpad(name, w + 1))
         end
         println(io, "│")
         ## e.g. ├───────┼───────┼───────┼────────┤
@@ -278,7 +278,7 @@ function print_time_array(io::IO, ta::TimeArray{T}, short=false) where T
                 println(io)
                 print(io, "│ ", ts[i], " ")
                 for j in p
-                    print(io, "│ ", rpad(strs[i, j], colwidth[j] + 1))
+                    print(io, "│ ", _rpad(strs[i, j], colwidth[j] + 1))
                 end
                 print(io, "│")
             end
@@ -290,7 +290,7 @@ function print_time_array(io::IO, ta::TimeArray{T}, short=false) where T
                 println(io)
                 print(io, "│ ", ts[i], " ")
                 for j in p
-                    print(io, "│ ", rpad(strs[i, j], colwidth[j] + 1))
+                    print(io, "│ ", _rpad(strs[i, j], colwidth[j] + 1))
                 end
                 print(io, "│")
             end
@@ -300,7 +300,7 @@ function print_time_array(io::IO, ta::TimeArray{T}, short=false) where T
                 println(io)
                 print(io, "│ ", ts[i], " ")
                 for j in p
-                    print(io, "│ ", rpad(strs[i, j], colwidth[j] + 1))
+                    print(io, "│ ", _rpad(strs[i, j], colwidth[j] + 1))
                 end
                 print(io, "│")
             end

diff --git a/src/utilities.jl b/src/utilities.jl
@@ -186,3 +186,14 @@ findcol(ta::AbstractTimeSeries, s::Symbol) = findcol(colnames(ta), s)
     (i === nothing) && throw(KeyError(s))
     i
 end
+
+"""
+Unicode friendly rpad
+"""
+function _rpad(s::AbstractString, n::Integer)
+  x = n - textwidth(s)
+  (x ≤ 0) && return s
+  s * (" "^x)
+end
+
+_rpad(s::Symbol, n::Integer) = _rpad(string(s), n::Integer)