benbot/nvim-treesitter
1
0
Fork 0
mirror of https://github.com/nvim-treesitter/nvim-treesitter.git synced 2026-07-04 04:20:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Java highlights: Capture parameters in declaration (#93)

Browse source 
* Capture parameters in declaration

* Refactor (new syntax)

* Fix spaces

* Fix capture (java method parameters)

* Improve java parameter capture

* Fix bracket and whitespace

* Fix java query

* Fix java query

Co-authored-by: Thomas Vigouroux <39092278+vigoux@users.noreply.github.com>

* Add capture for lambda parameters, remove redundant captures, add -> operator

* Previous commit wasn't saved properly

* Fix formatting

* Changes suggested in PR

https://github.com/nvim-treesitter/nvim-treesitter/pull/93#pullrequestreview-435630553

* Add bitwise operators

* Re-add builtin operators

* remove left shift, add ^=

* Add &= and |=

* remove @variable

* Remove duplicate

Co-authored-by: Thomas Vigouroux <39092278+vigoux@users.noreply.github.com>
This commit is contained in:
Chinmay Dalal 2020-06-29 14:18:13 +05:30 • committed by GitHub
parent 54438439e6
commit b184f1cafb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 64 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

95
queries/java/highlights.scm
View file

@ -2,20 +2,32 @@
; Methods
(method_declaration
name: (identifier) @method)
(method_invocation
name: (identifier) @method)
(super) @function.builtin
; Parameters
(formal_parameter
name: (identifier) @parameter)
(inferred_parameters (identifier) @parameter)
; Annotations
(annotation
name: (identifier) @attribute)
(marker_annotation
name: (identifier) @attribute)
; Operators
[
"@"
"+"
@ -41,6 +53,15 @@
"*="
"/="
"%="
"->"
"^"
"^="
"&="
"|="
"~"
">>"
">>>"
"<<"
] @operator
; Types
@ -51,40 +72,46 @@
name: (identifier) @type)
(enum_declaration
name: (identifier) @type)
(constructor_declaration
name: (identifier) @type)
(type_identifier) @type
((field_access
object: (identifier) @type)
(#match? @type "^[A-Z]"))
(#match? @type "^[A-Z]"))
((scoped_identifier
scope: (identifier) @type)
(#match? @type "^[A-Z]"))
(#match? @type "^[A-Z]"))
(constructor_declaration
name: (identifier) @type)
(type_identifier) @type
(boolean_type) @type.builtin
(integral_type) @type.builtin
(floating_point_type) @type.builtin
(floating_point_type) @type.builtin
(void_type) @type.builtin
[
(boolean_type)
(integral_type)
(floating_point_type)
(void_type)
] @type.builtin
; Variables
((identifier) @constant
(#match? @constant "^_*[A-Z][A-Z\d_]+"))
(#match? @constant "^_*[A-Z][A-Z\d_]+"))
(identifier) @variable
(this) @variable.builtin
; Literals
(hex_integer_literal) @number
(decimal_integer_literal) @number
(octal_integer_literal) @number
(decimal_floating_point_literal) @float
(hex_floating_point_literal) @float
[
(hex_integer_literal)
(decimal_integer_literal)
(octal_integer_literal)
] @number
[
(decimal_floating_point_literal)
(hex_floating_point_literal)
] @float
(character_literal) @character
(string_literal) @string
(null_literal) @constant.builtin
@ -106,7 +133,6 @@
"class"
"continue"
"default"
"do"
"enum"
"exports"
"extends"
@ -150,25 +176,32 @@
"case"
] @conditional
;
;
[
"for"
"while"
"do"
] @repeat
;
; Includes
"import" @include
"package" @include
; Punctuation
";" @punctuation.delimiter
"." @punctuation.delimiter
"," @punctuation.delimiter
"[" @punctuation.bracket
"]" @punctuation.bracket
"{" @punctuation.bracket
"}" @punctuation.bracket
"(" @punctuation.bracket
")" @punctuation.bracket
[
";"
"."
","
] @punctuation.delimiter
[
"["
"]"
"{"
"}"
"("
")"
] @punctuation.bracket