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

Jump to bottom

Fix highlighting for left parenthesis after keywords #59

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix highlighting for left parenthesis after keywords #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c6b1d3
Fix left meta.brace.round for keywords
Zorbn Dec 28, 2023
8f87a2b
Fix left meta.brace.round for cast/catch
Zorbn Dec 28, 2023
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
8 changes: 6 additions & 2 deletions baselines/Cast.hx.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,10 @@ var b:Int = cast (2, Dynamic<Int>);
source.hx
^^^^
source.hx keyword.other.untyped.hx
^^
^
source.hx
^
source.hx meta.brace.round.hx
^
source.hx constant.numeric.decimal.hx
^^
Expand Down Expand Up @@ -80,8 +82,10 @@ var b:Int = cast (2, Dynamic<Int>);
source.hx
^^^^
source.hx keyword.other.untyped.hx
^^
^
source.hx
^
source.hx meta.brace.round.hx
^
source.hx constant.numeric.decimal.hx
^^
Expand Down
2 changes: 1 addition & 1 deletion baselines/Extractors.hx.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ var success = switch (e) {
^^^^^
source.hx keyword.other.trace.hx
^
source.hx
source.hx meta.brace.round.hx
^
source.hx variable.other.hx
^
Expand Down
16 changes: 10 additions & 6 deletions baselines/IsOperator.hx.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ var is:Int;
^^^^^
source.hx keyword.other.trace.hx
^
source.hx
source.hx meta.brace.round.hx
^
source.hx meta.brace.round.hx
^
Expand All @@ -95,7 +95,7 @@ var is:Int;
^^^^^
source.hx variable.language.hx
^
source.hx
source.hx meta.brace.round.hx
^
source.hx meta.brace.round.hx
^
Expand Down Expand Up @@ -162,8 +162,10 @@ var is:Int;
>while (("" is String)) {}
^^^^^
source.hx keyword.control.flow-control.hx
^^
^
source.hx
^
source.hx meta.brace.round.hx
^
source.hx meta.brace.round.hx
^
Expand Down Expand Up @@ -347,7 +349,7 @@ var is:Int;
^^^^^
source.hx keyword.other.trace.hx
^
source.hx
source.hx meta.brace.round.hx
^
source.hx string.quoted.double.hx punctuation.definition.string.begin.hx
^
Expand All @@ -368,7 +370,7 @@ var is:Int;
^^^^^
source.hx variable.language.hx
^
source.hx
source.hx meta.brace.round.hx
^
source.hx string.quoted.double.hx punctuation.definition.string.begin.hx
^
Expand All @@ -388,8 +390,10 @@ var is:Int;
>while ("" is String) {}
^^^^^
source.hx keyword.control.flow-control.hx
^^
^
source.hx
^
source.hx meta.brace.round.hx
^
source.hx string.quoted.double.hx punctuation.definition.string.begin.hx
^
Expand Down
4 changes: 3 additions & 1 deletion baselines/Issue16.hx.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ Foo(if (true) true else false);
source.hx meta.brace.round.hx
^^
source.hx keyword.control.flow-control.hx
^^
^
source.hx
^
source.hx meta.brace.round.hx
^^^^
source.hx constant.language.hx
^
Expand Down
2 changes: 1 addition & 1 deletion baselines/Issue2.hx.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class C {
^^^^^
source.hx meta.class.hx meta.block.hx meta.method.hx meta.method.block.hx keyword.other.trace.hx
^
source.hx meta.class.hx meta.block.hx meta.method.hx meta.method.block.hx
source.hx meta.class.hx meta.block.hx meta.method.hx meta.method.block.hx meta.brace.round.hx
^
source.hx meta.class.hx meta.block.hx meta.method.hx meta.method.block.hx string.quoted.double.hx punctuation.definition.string.begin.hx
^^
Expand Down
4 changes: 2 additions & 2 deletions baselines/Issue33.hx.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ trace(" ) -> ");
^^
source.hx keyword.control.flow-control.hx
^
source.hx
source.hx meta.brace.round.hx
^
source.hx string.quoted.double.hx punctuation.definition.string.begin.hx
^^^^^^
Expand All @@ -21,7 +21,7 @@ trace(" ) -> ");
^^^^^
source.hx keyword.other.trace.hx
^
source.hx
source.hx meta.brace.round.hx
^
source.hx string.quoted.double.hx punctuation.definition.string.begin.hx
^^^^^^
Expand Down
4 changes: 2 additions & 2 deletions baselines/KeyValueIterators.hx.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ for (index => value in array) {
^^^^^
source.hx keyword.other.trace.hx
^
source.hx
source.hx meta.brace.round.hx
^^^
source.hx variable.other.hx
^
Expand Down Expand Up @@ -102,7 +102,7 @@ for (index => value in array) {
^^^^^
source.hx keyword.other.trace.hx
^
source.hx
source.hx meta.brace.round.hx
^^^
source.hx variable.other.hx
^
Expand Down
8 changes: 6 additions & 2 deletions baselines/Loops.hx.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,10 @@ do {
>while (true) {}
^^^^^
source.hx keyword.control.flow-control.hx
^^
^
source.hx
^
source.hx meta.brace.round.hx
^^^^
source.hx constant.language.hx
^
Expand Down Expand Up @@ -114,8 +116,10 @@ do {
source.hx
^^^^^
source.hx keyword.control.flow-control.hx
^^
^
source.hx
^
source.hx meta.brace.round.hx
^^^^
source.hx constant.language.hx
^
Expand Down
2 changes: 1 addition & 1 deletion baselines/MacroReification.hx.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ class Foo {
^^^^^
source.hx meta.class.hx meta.block.hx meta.method.hx meta.method.block.hx meta.method.hx meta.method.block.hx keyword.other.trace.hx
^
source.hx meta.class.hx meta.block.hx meta.method.hx meta.method.block.hx meta.method.hx meta.method.block.hx
source.hx meta.class.hx meta.block.hx meta.method.hx meta.method.block.hx meta.method.hx meta.method.block.hx meta.brace.round.hx
^
source.hx meta.class.hx meta.block.hx meta.method.hx meta.method.block.hx meta.method.hx meta.method.block.hx punctuation.definition.reification.hx
^
Expand Down
12 changes: 9 additions & 3 deletions baselines/PatternMatching.hx.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,10 @@ class Colors {
source.hx
^^
source.hx keyword.control.flow-control.hx
^^
^
source.hx
^
source.hx meta.brace.round.hx
^^^^^^^^^^^
source.hx support.class.builtin.hx
^
Expand Down Expand Up @@ -139,8 +141,10 @@ class Colors {
source.hx
^^
source.hx keyword.control.flow-control.hx
^^
^
source.hx
^
source.hx meta.brace.round.hx
^^^^^^^^^^^
source.hx support.class.builtin.hx
^
Expand Down Expand Up @@ -203,8 +207,10 @@ class Colors {
source.hx
^^
source.hx keyword.control.flow-control.hx
^^
^
source.hx
^
source.hx meta.brace.round.hx
^^^^^^
source.hx keyword.control.flow-control.hx
^
Expand Down
4 changes: 3 additions & 1 deletion baselines/TryCatch.hx.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,10 @@ try {
source.hx
^^^^^
source.hx keyword.control.catch-exception.hx
^^
^
source.hx
^
source.hx meta.brace.round.hx
^
source.hx variable.other.hx
^
Expand Down
6 changes: 3 additions & 3 deletions haxe.YAML-tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,15 +806,15 @@ repository:
patterns:
- begin: (?<=trace|$type|if|while|for|super)\s*(\()
beginCaptures:
'2': {name: meta.brace.round.hx}
'1': {name: meta.brace.round.hx}
end: \)
endCaptures:
'0': {name: meta.brace.round.hx}
patterns:
- include: '#block-contents'
- begin: (?<=catch)\s*(\()
beginCaptures:
'2': {name: meta.brace.round.hx}
'1': {name: meta.brace.round.hx}
end: \)
endCaptures:
'0': {name: meta.brace.round.hx}
Expand All @@ -824,7 +824,7 @@ repository:
# safe cast
- begin: (?<=cast)\s*(\()
beginCaptures:
'2': {name: meta.brace.round.hx}
'1': {name: meta.brace.round.hx}
end: \)
endCaptures:
'0': {name: meta.brace.round.hx}
Expand Down
20 changes: 10 additions & 10 deletions haxe.tmLanguage
View file
Open in desktop

Large diffs are not rendered by default.