Skip to content

Commit 67e8d6c

Browse files
inkydragontecosaur
authored andcommitted
Adapt to breaking changes with JuliaSyntax
The source changes: 1. Replace K"true" and K"false" with K"Bool" JuliaLang/JuliaSyntax.jl@b92fc5e5dab7 2. Rename haschildren() to is_leaf() JuliaLang/JuliaSyntax.jl@d8796c6ac136 Also update the tests and doctests to reflect a change in the syntax pass.
1 parent 21edd86 commit 67e8d6c

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

src/JuliaSyntaxHighlighting.jl

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ function _hl_annotations!(highlights::Vector{@NamedTuple{region::UnitRange{Int},
195195
!JuliaSyntax.is_prec_assignment(node) &&
196196
!JuliaSyntax.is_word_operator(node) &&
197197
nkind != K"." && nkind != K"..." &&
198-
(JuliaSyntax.is_trivia(node) || !JuliaSyntax.haschildren(node))
198+
(JuliaSyntax.is_trivia(node) || JuliaSyntax.is_leaf(node))
199199
face = if nkind == K"Identifier"
200200
if pkind == K"curly"
201201
:julia_type
@@ -241,7 +241,7 @@ function _hl_annotations!(highlights::Vector{@NamedTuple{region::UnitRange{Int},
241241
(highlights[end] = (highlights[end][1], :face, :julia_char_delim))
242242
:julia_char
243243
elseif nkind == K"'" && kind(lnode) == K"Char"; :julia_char_delim
244-
elseif nkind == K"true" || nkind == K"false"; :julia_bool
244+
elseif nkind == K"Bool"; :julia_bool
245245
elseif JuliaSyntax.is_number(nkind); :julia_number
246246
elseif JuliaSyntax.is_prec_assignment(nkind) && JuliaSyntax.is_trivia(node);
247247
if nkind == K"="
@@ -370,11 +370,10 @@ julia> JuliaSyntaxHighlighting.highlight("sum(1:8)")
370370
"sum(1:8)"
371371
372372
julia> JuliaSyntaxHighlighting.highlight("sum(1:8)") |> Base.annotations
373-
6-element Vector{@NamedTuple{region::UnitRange{Int64}, label::Symbol, value}}:
373+
5-element Vector{@NamedTuple{region::UnitRange{Int64}, label::Symbol, value}}:
374374
@NamedTuple{region::UnitRange{Int64}, label::Symbol, value}((1:3, :face, :julia_funcall))
375375
@NamedTuple{region::UnitRange{Int64}, label::Symbol, value}((4:4, :face, :julia_rainbow_paren_1))
376376
@NamedTuple{region::UnitRange{Int64}, label::Symbol, value}((5:5, :face, :julia_number))
377-
@NamedTuple{region::UnitRange{Int64}, label::Symbol, value}((6:6, :face, :julia_operator))
378377
@NamedTuple{region::UnitRange{Int64}, label::Symbol, value}((7:7, :face, :julia_number))
379378
@NamedTuple{region::UnitRange{Int64}, label::Symbol, value}((8:8, :face, :julia_rainbow_paren_1))
380379
```
@@ -420,11 +419,10 @@ julia> JuliaSyntaxHighlighting.highlight!(str)
420419
"sum(1:8)"
421420
422421
julia> Base.annotations(str)
423-
6-element Vector{@NamedTuple{region::UnitRange{Int64}, label::Symbol, value}}:
422+
5-element Vector{@NamedTuple{region::UnitRange{Int64}, label::Symbol, value}}:
424423
@NamedTuple{region::UnitRange{Int64}, label::Symbol, value}((1:3, :face, :julia_funcall))
425424
@NamedTuple{region::UnitRange{Int64}, label::Symbol, value}((4:4, :face, :julia_rainbow_paren_1))
426425
@NamedTuple{region::UnitRange{Int64}, label::Symbol, value}((5:5, :face, :julia_number))
427-
@NamedTuple{region::UnitRange{Int64}, label::Symbol, value}((6:6, :face, :julia_operator))
428426
@NamedTuple{region::UnitRange{Int64}, label::Symbol, value}((7:7, :face, :julia_number))
429427
@NamedTuple{region::UnitRange{Int64}, label::Symbol, value}((8:8, :face, :julia_rainbow_paren_1))
430428
```

test/runtests.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ sum1to8_highlighted = Base.AnnotatedString("sum(1:8)", [
1212
(1:3, :face, :julia_funcall),
1313
(4:4, :face, :julia_rainbow_paren_1),
1414
(5:5, :face, :julia_number),
15-
(6:6, :face, :julia_operator),
1615
(7:7, :face, :julia_number),
1716
(8:8, :face, :julia_rainbow_paren_1)
1817
])

0 commit comments

Comments
 (0)