Skip to content

Commit e34cc37

Browse files
committed
More consistent if-else rule tree formating
Since the rules are now complex enough that we can't have most of them be single line "elseif ...; :julia_xyz" statements, it's better to just put the face names consistently on their own line.
1 parent 14d4d09 commit e34cc37

File tree

1 file changed

+30
-15
lines changed

1 file changed

+30
-15
lines changed

src/JuliaSyntaxHighlighting.jl

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,10 @@ function _hl_annotations!(highlights::Vector{@NamedTuple{region::UnitRange{Int},
237237
elseif nkind == K"macrocall" && kind(node[1]) == K"macro_name"
238238
region = first(region):first(region)+span(node[1])-1
239239
:julia_macro
240-
elseif nkind == K"StrMacroName"; :julia_macro
241-
elseif nkind == K"CmdMacroName"; :julia_macro
240+
elseif nkind == K"StrMacroName"
241+
:julia_macro
242+
elseif nkind == K"CmdMacroName"
243+
:julia_macro
242244
elseif nkind == K"::"
243245
if JuliaSyntax.is_trivia(node) || numchildren(node) == 0
244246
:julia_typedec
@@ -255,15 +257,24 @@ function _hl_annotations!(highlights::Vector{@NamedTuple{region::UnitRange{Int},
255257
elseif nkind == K"quote" && numchildren(node) == 2 &&
256258
kind(node[1]) == K":" && kind(node[2]) == K"Identifier"
257259
:julia_symbol
258-
elseif nkind == K"Comment"; :julia_comment
259-
elseif nkind == K"String"; :julia_string
260-
elseif JuliaSyntax.is_string_delim(node); :julia_string_delim
261-
elseif nkind == K"CmdString"; :julia_cmd
262-
elseif nkind == K"`" || nkind == K"```"; :julia_cmd_delim
263-
elseif nkind == K"Char"; :julia_char
264-
elseif nkind == K"'" && pkind == K"char"; :julia_char_delim
265-
elseif nkind == K"Bool"; :julia_bool
266-
elseif JuliaSyntax.is_number(nkind); :julia_number
260+
elseif nkind == K"Comment"
261+
:julia_comment
262+
elseif nkind == K"String"
263+
:julia_string
264+
elseif JuliaSyntax.is_string_delim(node)
265+
:julia_string_delim
266+
elseif nkind == K"CmdString"
267+
:julia_cmd
268+
elseif nkind == K"`" || nkind == K"```"
269+
:julia_cmd_delim
270+
elseif nkind == K"Char"
271+
:julia_char
272+
elseif nkind == K"'" && pkind == K"char"
273+
:julia_char_delim
274+
elseif nkind == K"Bool"
275+
:julia_bool
276+
elseif JuliaSyntax.is_number(nkind)
277+
:julia_number
267278
elseif JuliaSyntax.is_prec_assignment(nkind) && JuliaSyntax.is_trivia(node);
268279
if JuliaSyntax.is_syntactic_assignment(nkind)
269280
ifelse(ppkind == K"for", :julia_keyword, :julia_assignment)
@@ -289,14 +300,18 @@ function _hl_annotations!(highlights::Vector{@NamedTuple{region::UnitRange{Int},
289300
:julia_type
290301
end
291302
end
292-
elseif nkind == K"in" && pkind == K"in"; :julia_keyword
293-
elseif nkind == K"isa"; :julia_builtin
303+
elseif nkind == K"in" && pkind == K"in"
304+
:julia_keyword
305+
elseif nkind == K"isa"
306+
:julia_builtin
294307
elseif nkind in (K"&&", K"||", K"<:", K"===") && JuliaSyntax.is_trivia(node)
295308
:julia_builtin
296309
elseif JuliaSyntax.is_prec_comparison(nkind) && JuliaSyntax.is_trivia(node);
297310
:julia_comparator
298-
elseif isplainoperator(node, pnode); :julia_operator
299-
elseif nkind == K"..." && JuliaSyntax.is_trivia(node); :julia_operator
311+
elseif isplainoperator(node, pnode)
312+
:julia_operator
313+
elseif nkind == K"..." && JuliaSyntax.is_trivia(node)
314+
:julia_operator
300315
elseif nkind == K"." && JuliaSyntax.is_trivia(node) && kind(pnode) == K"dotcall";
301316
:julia_broadcast
302317
elseif nkind in (K"call", K"dotcall") && JuliaSyntax.is_prefix_call(node)

0 commit comments

Comments
 (0)