Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct code point format in Base/Char/show function #33291

Merged
merged 6 commits into from
Sep 18, 2019
Merged

Correct code point format in Base/Char/show function #33291

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c5216e0
Correct code point format in Base/Char/show function
srutzky Sep 17, 2019
96d668d
Add tests for U+ syntax formatting
srutzky Sep 17, 2019
8a6280e
Update code point format to match change in show() function
srutzky Sep 18, 2019
f364e43
Update code point format to match change in show() function
srutzky Sep 18, 2019
0452e63
Update code point format to match change in show() function
srutzky Sep 18, 2019
2492028
Update code point format to match change in show() function
srutzky Sep 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion base/char.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ function show(io::IO, ::MIME"text/plain", c::T) where {T<:AbstractChar}
else
u = codepoint(c)
end
h = string(u, base = 16, pad = u ≤ 0xffff ? 4 : 6)
h = uppercase(string(u, base = 16, pad = 4))
print(io, (isascii(c) ? "ASCII/" : ""), "Unicode U+", h)
else
print(io, ": Malformed UTF-8")
Expand Down
9 changes: 9 additions & 0 deletions test/char.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,3 +290,12 @@ end
@testset "broadcasting of Char" begin
@test identity.('a') == 'a'
end

@testset "code point format of U+ syntax (PR 33291)" begin
@test repr("text/plain", '\n') == "'\\n': ASCII/Unicode U+000A (category Cc: Other, control)"
@test repr("text/plain", '/') == "'/': ASCII/Unicode U+002F (category Po: Punctuation, other)"
@test repr("text/plain", '\u10e') == "'Ď': Unicode U+010E (category Lu: Letter, uppercase)"
@test repr("text/plain", '\u3a2c') == "'㨬': Unicode U+3A2C (category Lo: Letter, other)"
@test repr("text/plain", '\U001f428') == "'🐨': Unicode U+1F428 (category So: Symbol, other)"
@test repr("text/plain", '\U010f321') == "'\\U10f321': Unicode U+10F321 (category Co: Other, private use)"
end