diff options
| -rw-r--r-- | lockfile.json | 2 | ||||
| -rw-r--r-- | queries/java/highlights.scm | 258 | ||||
| -rw-r--r-- | queries/java/indents.scm | 4 | ||||
| -rw-r--r-- | queries/java/injections.scm | 5 |
4 files changed, 137 insertions, 132 deletions
diff --git a/lockfile.json b/lockfile.json index 87d030bc5..ad0a4f7ba 100644 --- a/lockfile.json +++ b/lockfile.json @@ -204,7 +204,7 @@ "revision": "1a0ce072ebf3afac7d5603d9a95bb7c9a6709b44" }, "java": { - "revision": "dd597f13eb9bab0c1bccc9aec390e8e6ebf9e0a6" + "revision": "3c24aa9365985830421a3a7b6791b415961ea770" }, "javascript": { "revision": "266455e22fc54f0add4dd2404ebe307d4d65deae" diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm index 625c2b5b7..717a13bad 100644 --- a/queries/java/highlights.scm +++ b/queries/java/highlights.scm @@ -14,8 +14,10 @@ (super) @function.builtin ; Parameters + (formal_parameter name: (identifier) @parameter) + (catch_formal_parameter name: (identifier) @parameter) @@ -24,59 +26,58 @@ name: (identifier) @parameter)) ; int... foo ;; Lambda parameter + (inferred_parameters (identifier) @parameter) ; (x,y) -> ... + (lambda_expression parameters: (identifier) @parameter) ; x -> ... - ; Annotations - (annotation name: (identifier) @attribute) (marker_annotation name: (identifier) @attribute) - ; Operators [ -"@" -"+" -":" -"++" -"-" -"--" -"&" -"&&" -"|" -"||" -"!" -"!=" -"==" -"*" -"/" -"%" -"<" -"<=" -">" -">=" -"=" -"-=" -"+=" -"*=" -"/=" -"%=" -"->" -"^" -"^=" -"&=" -"|=" -"~" -">>" -">>>" -"<<" -"::" + "@" + "+" + ":" + "++" + "-" + "--" + "&" + "&&" + "|" + "||" + "!" + "!=" + "==" + "*" + "/" + "%" + "<" + "<=" + ">" + ">=" + "=" + "-=" + "+=" + "*=" + "/=" + "%=" + "->" + "^" + "^=" + "&=" + "|=" + "~" + ">>" + ">>>" + "<<" + "::" ] @operator ; Types @@ -99,8 +100,6 @@ . (identifier) @type) (#lua-match? @type "^[A-Z]")) - - ((field_access object: (identifier) @type) (#lua-match? @type "^[A-Z]")) @@ -118,10 +117,10 @@ field: (identifier) @field) [ -(boolean_type) -(integral_type) -(floating_point_type) -(void_type) + (boolean_type) + (integral_type) + (floating_point_type) + (void_type) ] @type.builtin ; Variables @@ -133,145 +132,150 @@ ; Literals -[ -(hex_integer_literal) -(decimal_integer_literal) -(octal_integer_literal) -(binary_integer_literal) -] @number +(string_literal) @string -[ -(decimal_floating_point_literal) -(hex_floating_point_literal) -] @float +(escape_sequence) @string.escape (character_literal) @character -[(string_literal) (text_block)] @string -(null_literal) @constant.builtin [ - (line_comment) - (block_comment) -] @comment @spell + (hex_integer_literal) + (decimal_integer_literal) + (octal_integer_literal) |