feat(java): distinguish escape sequences, move certain keywords to more appropriate places

lockfile.json

@@ -204,7 +204,7 @@
     "revision": "1a0ce072ebf3afac7d5603d9a95bb7c9a6709b44"
   },
   "java": {
-    "revision": "dd597f13eb9bab0c1bccc9aec390e8e6ebf9e0a6"
+    "revision": "3c24aa9365985830421a3a7b6791b415961ea770"
   },
   "javascript": {
     "revision": "266455e22fc54f0add4dd2404ebe307d4d65deae"

queries/java/highlights.scm

@@ -14,8 +14,10 @@
 (super) @function.builtin
 
 ; Parameters
+
 (formal_parameter
   name: (identifier) @parameter)
+
 (catch_formal_parameter
   name: (identifier) @parameter)
 
@@ -24,20 +26,19 @@
    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
 
 [
@@ -99,8 +100,6 @@
   . (identifier) @type)
  (#lua-match? @type "^[A-Z]"))
 
-
-
 ((field_access
   object: (identifier) @type)
   (#lua-match? @type "^[A-Z]"))
@@ -133,6 +132,12 @@
 
 ; Literals
 
+(string_literal) @string
+
+(escape_sequence) @string.escape
+
+(character_literal) @character
+
 [
   (hex_integer_literal)
   (decimal_integer_literal)
@@ -145,43 +150,27 @@
   (hex_floating_point_literal)
 ] @float
 
-(character_literal) @character
-[(string_literal) (text_block)] @string
-(null_literal) @constant.builtin
-
-[
-  (line_comment)
-  (block_comment)
-] @comment @spell
-
 [
   (true)
   (false)
 ] @boolean
 
+(null_literal) @constant.builtin
+
 ; Keywords
 
 [
   "assert"
-"break"
   "class"
   "record"
-"continue"
   "default"
   "enum"
-"exports"
   "extends"
   "implements"
   "instanceof"
   "interface"
-"module"
-"opens"
-"package"
   "permits"
-"provides"
-"requires"
   "to"
-"uses"
   "with"
 ] @keyword
 
@@ -231,18 +220,28 @@
 
 (ternary_expression ["?" ":"] @conditional.ternary)
 
-;
+; Loops
 
 [
   "for"
   "while"
   "do"
+  "continue"
+  "break"
 ] @repeat
 
 ; Includes
 
-"import" @include
+[
-"package" @include
+  "exports"
+  "import"
+  "module"
+  "opens"
+  "package"
+  "provides"
+  "requires"
+  "uses"
+] @include
 
 ; Punctuation
 
@@ -253,14 +252,11 @@
   ","
 ] @punctuation.delimiter
 
-[
+[ "{" "}" ] @punctuation.bracket
-"["
+
-"]"
+[ "[" "]" ] @punctuation.bracket
-"{"
+
-"}"
+[ "(" ")" ] @punctuation.bracket
-"("
-")"
-] @punctuation.bracket
 
 ; Exceptions
 
@@ -273,5 +269,13 @@
 ] @exception
 
 ; Labels
+
 (labeled_statement
   (identifier) @label)
+
+; Comments
+
+[
+  (line_comment)
+  (block_comment)
+] @comment @spell

queries/java/indents.scm

@@ -22,9 +22,7 @@
   "]"
 ] @branch
 
-[
+"}" @indent_end
-  "}"
-] @indent_end
 
 (line_comment) @ignore
 

queries/java/injections.scm

@@ -1 +1,4 @@
-[(block_comment) (line_comment)] @comment
+[
+  (block_comment)
+  (line_comment)
+] @comment