Skip to content

Commit a9acdae

Browse files
authored
Change annotations to use a NamedTuple (JuliaLang#55741)
Due to popular demand, the type of annotations is to be changed from a `Tuple{UnitRange{Int}, Pair{Symbol, Any}}` to a `NamedTuple{(:region, :label, :value), Tuple{UnitRange{Int}, Symbol, Any}}`. This requires the expected code churn to `strings/annotated.jl`, and some changes to the StyledStrings and JuliaSyntaxHighlighting libraries. Closes JuliaLang#55249 and closes JuliaLang#55245.
1 parent a7521ea commit a9acdae

File tree

15 files changed

+226
-204
lines changed

15 files changed

+226
-204
lines changed

base/strings/annotated.jl

Lines changed: 123 additions & 103 deletions
Large diffs are not rendered by default.

base/strings/io.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -816,12 +816,12 @@ function AnnotatedString(chars::AbstractVector{C}) where {C<:AbstractChar}
816816
end
817817
end
818818
end
819-
annots = Tuple{UnitRange{Int}, Pair{Symbol, Any}}[]
819+
annots = RegionAnnotation[]
820820
point = 1
821821
for c in chars
822822
if c isa AnnotatedChar
823823
for annot in c.annotations
824-
push!(annots, (point:point, annot))
824+
push!(annots, (point:point, annot...))
825825
end
826826
end
827827
point += ncodeunits(c)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
401bb32ca43a8460d6790ee80e695bb5
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
db2c732d3343f5a8770b3516cdd900587d497feab2259a937d354fac436ab3cb099b0401fb4e05817e75744fb9877ab69b1e4879d8a710b33b69c95b7e58d961

deps/checksums/JuliaSyntaxHighlighting-b89dd99db56700c47434df6106b6c6afd1c9ed01.tar.gz/md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

deps/checksums/JuliaSyntaxHighlighting-b89dd99db56700c47434df6106b6c6afd1c9ed01.tar.gz/sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f053c84279a8920f355f202e605842af
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
b6f4c1d6c0dc73a520472746c96adff506e5405154e4b93d419e07b577b01804d2fc87d4a6cac48a136777579bebf8388c2c1e54f849b51e233138d482146b4f

deps/checksums/StyledStrings-f6035eb97b516862b16e36cab2ecc6ea8adc3d7c.tar.gz/md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

deps/checksums/StyledStrings-f6035eb97b516862b16e36cab2ecc6ea8adc3d7c.tar.gz/sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)