Skip to content

Commit 85764f8

Browse files
committed
Rename *_parenthetical faces to *_parentheses
I don't know what I was thinking at the time, but "parenthetical" isn't right.
1 parent a12a86a commit 85764f8

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

docs/src/index.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,23 +47,23 @@ The current set of faces, and their default values are as follows:
4747
- `julia_comparator`: inherits from `julia_operator`
4848
- `julia_assignment`: bright red
4949
- `julia_keyword`: red
50-
- `julia_parenthetical`: unstyled
51-
- `julia_unpaired_parenthetical`: inherit from `julia_error` and `julia_parenthetical`
50+
- `julia_parentheses`: unstyled
51+
- `julia_unpaired_parentheses`: inherit from `julia_error` and `julia_parentheses`
5252
- `julia_error`: red background
53-
- `julia_rainbow_paren_1`: bright green, inherits from `julia_parenthetical`
54-
- `julia_rainbow_paren_2`: bright blue, inherits from `julia_parenthetical`
55-
- `julia_rainbow_paren_3`: bright red, inherits from `julia_parenthetical`
53+
- `julia_rainbow_paren_1`: bright green, inherits from `julia_parentheses`
54+
- `julia_rainbow_paren_2`: bright blue, inherits from `julia_parentheses`
55+
- `julia_rainbow_paren_3`: bright red, inherits from `julia_parentheses`
5656
- `julia_rainbow_paren_4`: inherits from `julia_rainbow_paren_1`
5757
- `julia_rainbow_paren_5`: inherits from `julia_rainbow_paren_2`
5858
- `julia_rainbow_paren_6`: inherits from `julia_rainbow_paren_3`
59-
- `julia_rainbow_bracket_1`: blue, inherits from `julia_parenthetical`
60-
- `julia_rainbow_bracket_2`: bright_magenta, inherits from `julia_parenthetical`
59+
- `julia_rainbow_bracket_1`: blue, inherits from `julia_parentheses`
60+
- `julia_rainbow_bracket_2`: bright_magenta, inherits from `julia_parentheses`
6161
- `julia_rainbow_bracket_3`: inherits from `julia_rainbow_bracket_1`
6262
- `julia_rainbow_bracket_4`: inherits from `julia_rainbow_bracket_2`
6363
- `julia_rainbow_bracket_5`: inherits from `julia_rainbow_bracket_1`
6464
- `julia_rainbow_bracket_6`: inherits from `julia_rainbow_bracket_2`
65-
- `julia_rainbow_curly_1`: bright yellow, inherits from `julia_parenthetical`
66-
- `julia_rainbow_curly_2`: yellow, inherits from `julia_parenthetical`
65+
- `julia_rainbow_curly_1`: bright yellow, inherits from `julia_parentheses`
66+
- `julia_rainbow_curly_2`: yellow, inherits from `julia_parentheses`
6767
- `julia_rainbow_curly_3`: inherits from `julia_rainbow_curly_1`
6868
- `julia_rainbow_curly_4`: inherits from `julia_rainbow_curly_2`
6969
- `julia_rainbow_curly_5`: inherits from `julia_rainbow_curly_1`

src/JuliaSyntaxHighlighting.jl

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ const MAX_PAREN_HIGHLIGHT_DEPTH = 6
1818
1919
Whether to use `julia_rainbow_{paren,bracket_curly}_{n}` faces for
2020
delimitors/parentheses (`()`, `[]`, `{}`) as opposed to just using
21-
`julia_parenthetical`.
21+
`julia_parentheses`.
2222
"""
2323
const RAINBOW_DELIMITERS_ENABLED = Ref(true)
2424
"""
2525
UNMATCHED_DELIMITERS_ENABLED
2626
27-
Whether to apply the `julia_unpaired_parenthetical` face to unpaired closing
27+
Whether to apply the `julia_unpaired_parentheses` face to unpaired closing
2828
parenthesis (`)`, `]`, '}').
2929
"""
3030
const UNMATCHED_DELIMITERS_ENABLED = Ref(true)
@@ -83,24 +83,24 @@ const HIGHLIGHT_FACES = [
8383
:julia_comparator => Face(inherit = :julia_operator),
8484
:julia_assignment => Face(foreground=:bright_red),
8585
:julia_keyword => Face(foreground=:red),
86-
:julia_parenthetical => Face(),
87-
:julia_unpaired_parenthetical => Face(inherit=[:julia_error, :julia_parenthetical]),
86+
:julia_parentheses => Face(),
87+
:julia_unpaired_parentheses => Face(inherit=[:julia_error, :julia_parentheses]),
8888
:julia_error => Face(background=:red),
8989
# Rainbow delimitors (1-6, (), [], and {})
90-
:julia_rainbow_paren_1 => Face(foreground=:bright_green, inherit=:julia_parenthetical),
91-
:julia_rainbow_paren_2 => Face(foreground=:bright_blue, inherit=:julia_parenthetical),
92-
:julia_rainbow_paren_3 => Face(foreground=:bright_red, inherit=:julia_parenthetical),
90+
:julia_rainbow_paren_1 => Face(foreground=:bright_green, inherit=:julia_parentheses),
91+
:julia_rainbow_paren_2 => Face(foreground=:bright_blue, inherit=:julia_parentheses),
92+
:julia_rainbow_paren_3 => Face(foreground=:bright_red, inherit=:julia_parentheses),
9393
:julia_rainbow_paren_4 => Face(inherit=:julia_rainbow_paren_1),
9494
:julia_rainbow_paren_5 => Face(inherit=:julia_rainbow_paren_2),
9595
:julia_rainbow_paren_6 => Face(inherit=:julia_rainbow_paren_3),
96-
:julia_rainbow_bracket_1 => Face(foreground=:blue, inherit=:julia_parenthetical),
97-
:julia_rainbow_bracket_2 => Face(foreground=:bright_magenta, inherit=:julia_parenthetical),
96+
:julia_rainbow_bracket_1 => Face(foreground=:blue, inherit=:julia_parentheses),
97+
:julia_rainbow_bracket_2 => Face(foreground=:bright_magenta, inherit=:julia_parentheses),
9898
:julia_rainbow_bracket_3 => Face(inherit=:julia_rainbow_bracket_1),
9999
:julia_rainbow_bracket_4 => Face(inherit=:julia_rainbow_bracket_2),
100100
:julia_rainbow_bracket_5 => Face(inherit=:julia_rainbow_bracket_1),
101101
:julia_rainbow_bracket_6 => Face(inherit=:julia_rainbow_bracket_2),
102-
:julia_rainbow_curly_1 => Face(foreground=:bright_yellow, inherit=:julia_parenthetical),
103-
:julia_rainbow_curly_2 => Face(foreground=:yellow, inherit=:julia_parenthetical),
102+
:julia_rainbow_curly_1 => Face(foreground=:bright_yellow, inherit=:julia_parentheses),
103+
:julia_rainbow_curly_2 => Face(foreground=:yellow, inherit=:julia_parentheses),
104104
:julia_rainbow_curly_3 => Face(inherit=:julia_rainbow_curly_1),
105105
:julia_rainbow_curly_4 => Face(inherit=:julia_rainbow_curly_2),
106106
:julia_rainbow_curly_5 => Face(inherit=:julia_rainbow_curly_1),
@@ -314,9 +314,9 @@ function _hl_annotations!(highlights::Vector{Tuple{UnitRange{Int}, Pair{Symbol,
314314
depth0
315315
end
316316
if pdepth <= 0 && UNMATCHED_DELIMITERS_ENABLED[]
317-
:julia_unpaired_parenthetical
317+
:julia_unpaired_parentheses
318318
elseif !RAINBOW_DELIMITERS_ENABLED[]
319-
:julia_parenthetical
319+
:julia_parentheses
320320
else
321321
displaydepth = mod1(pdepth, MAX_PAREN_HIGHLIGHT_DEPTH)
322322
Symbol("julia_rainbow_$(ptype)_$(displaydepth)")

0 commit comments

Comments
 (0)