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

[ST4] Add support for various block_caret_ global settings in color schemes. #317

Merged
merged 4 commits into from
Jan 6, 2021
Merged

[ST4] Add support for various block_caret_ global settings in color schemes. #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ac80cf7
Add completions for various `block_caret_` globals.
UltraInstinct05 Dec 1, 2020
6e2bbb7
Add appropriate highlighting for `block_caret_` globals.
UltraInstinct05 Dec 1, 2020
2e643a5
Add a new setting and a fix.
UltraInstinct05 Dec 2, 2020
0005ba2
A few fixes.
UltraInstinct05 Dec 2, 2020
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
24 changes: 24 additions & 0 deletions Package/Sublime Text Color Scheme/Completions/Globals Keys.sublime-completions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,30 @@
"contents": "\"block_caret\": \"$1\",",
"kind": ["keyword", "k", "globals"],
},
{
"trigger": "block_caret_corner_style",
"details": "Block caret corner style",
"contents": "\"block_caret_corner_style\": \"$1\",",
"kind": ["keyword", "k", "globals"],
},
{
"trigger": "block_caret_border",
"details": "Block caret border color",
"contents": "\"block_caret_border\": \"$1\",",
"kind": ["keyword", "k", "globals"],
},
{
"trigger": "block_caret_underline",
"details": "Color of the block caret in selection",
"contents": "\"block_caret_underline\": \"$1\",",
"kind": ["keyword", "k", "globals"],
},
{
"trigger": "block_caret_corner_radius",
"details": "Block caret corner radius",
"contents": "\"block_caret_corner_radius\": \"$1\",",
"kind": ["keyword", "k", "globals"],
},
{
"trigger": "bracket_contents_foreground",
"details": "Foreground color of highlighted brackets (inside)",
Expand Down
6 changes: 3 additions & 3 deletions Package/Sublime Text Color Scheme/Sublime Text Color Scheme.sublime-syntax
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ contexts:
|brackets_foreground|bracket_contents_foreground|tags_foreground
|minimap_border|gutter|gutter_foreground|rulers|fold_marker
|line_diff_(?:modified|added|deleted) # added in 3186 & 3189
|block_caret # added in 3190
|block_caret(?:_(?:border|underline))? # block_caret added in 3190, others in 4086.
)(")
captures:
1: punctuation.definition.string.begin.json
Expand All @@ -246,7 +246,7 @@ contexts:
2: entity.name.globals.sublime-color-scheme
3: punctuation.definition.string.end.json
set: [expect-css-string-value, expect-colon]
- match: (")(shadow_width|selection_corner_radius|selection_border_width|line_diff_width)(")
- match: (")(shadow_width|(?:selection|block_caret)_corner_radius|selection_border_width|line_diff_width)(")
captures:
1: punctuation.definition.string.begin.json
2: entity.name.globals.sublime-color-scheme
Expand All @@ -264,7 +264,7 @@ contexts:
2: entity.name.globals.sublime-color-scheme
3: punctuation.definition.string.end.json
set: [expect-underlinestyle-string-value, expect-colon]
- match: (")(selection_corner_style)(")
- match: (")((?:selection|block_caret)_corner_style)(")
captures:
1: punctuation.definition.string.begin.json
2: entity.name.globals.sublime-color-scheme
Expand Down