Highlight query improvements for java and typescript (#7145)

* Add missing queries to java highlights

* Fix generic type bracket highlights in typescript
This commit is contained in:
Gammut 2023-05-26 16:37:19 -05:00 committed by GitHub
parent 61a89956e3
commit 86ef389c0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 93 additions and 9 deletions

View file

@ -13,8 +13,6 @@
(marker_annotation
name: (identifier) @attribute)
"@" @operator
; Types
(interface_declaration
@ -48,6 +46,9 @@
(void_type)
] @type.builtin
(type_arguments
(wildcard "?" @type.builtin))
; Variables
((identifier) @constant
@ -87,6 +88,84 @@
(line_comment) @comment
(block_comment) @comment
; Punctuation
[
"::"
"."
";"
","
] @punctuation.delimiter
[
"@"
"..."
] @punctuation.special
[
"("
")"
"["
"]"
"{"
"}"
] @punctuation.bracket
(type_arguments
[
"<"
">"
] @punctuation.bracket)
(type_parameters
[
"<"
">"
] @punctuation.bracket)
; Operators
[
"="
">"
"<"
"!"
"~"
"?"
":"
"->"
"=="
">="
"<="
"!="
"&&"
"||"
"++"
"--"
"+"
"-"
"*"
"/"
"&"
"|"
"^"
"%"
"<<"
">>"
">>>"
"+="
"-="
"*="
"/="
"&="
"|="
"^="
"%="
"<<="
">>="
">>>="
] @operator
; Keywords
[

View file

@ -5,7 +5,6 @@
(ambient_declaration "global" @namespace)
; Variables
(required_parameter (identifier) @variable.parameter)
@ -22,8 +21,6 @@
(conditional_type ["?" ":"] @operator)
; Keywords
[
@ -50,16 +47,22 @@
"readonly"
] @keyword.storage.modifier
; inherits: ecma
; Types
(type_identifier) @type
(predefined_type) @type.builtin
(type_arguments
"<" @punctuation.bracket
">" @punctuation.bracket)
[
"<"
">"
] @punctuation.bracket)
(type_parameters
[
"<"
">"
] @punctuation.bracket)
((identifier) @type
(#match? @type "^[A-Z]"))
@ -75,3 +78,5 @@
(template_type
"${" @punctuation.special
"}" @punctuation.special) @embedded
; inherits: ecma