From 1ae9b0e4558fe7868f8cda2db65239cfb14836d0 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 24 Dec 2023 10:00:20 +0100
Subject: feat!: align standard captures with upstream

Problem: Sharing highlight queries with upstream tree-sitter and
Helix is difficult.

Solution: Where reasonable, use capture names in tree-sitter's standard
list or Helix's Atom-style hierarchy.

Specifically:

* tree-sitter "standard capture names"
  (https://github.com/tree-sitter/tree-sitter/blob/3f44b896852eb7daaa6df4fb778c9bb52c70c815/highlight/src/lib.rs#L20-L72):

  - `@parameter` -> `@variable.parameter`
  - `@field` -> `@variable.member`
  - `@namespace` -> `@module`
  - `@float` -> `@number.float`
  - `@symbol` -> `@string.special.symbol`
  - `@string.regex` -> `@string.regexp`
  - `@text.*` -> `@markup.*` (`strong`, `italic`, `link`, `strikethrough`; with exceptions; see below)
  - `@text.title` -> `@markup.heading`
  - `@text.literal` -> `@markup.raw`
  - `@text.reference` -> `@markup.link`
  - `@text.uri` -> `@markup.link.url` (in markup links)
  - `@string.special` -> `@markup.link.label` (non-url links)
  - `@punctuation.special` -> `@markup.list` (markdown lists only; move subitems from `@text.todo`)

* Helix captures
  (https://docs.helix-editor.com/master/themes.html#syntax-highlighting):

  - `@method` -> `@function.method`
  - `@method.call` -> `@function.method.call`
  - `@text.{todo,warning,note,danger}` -> `@comment.{error,warning,hint,info,todo}`
  - `@text.diff.{add,delete,}` -> `@diff.{plus,minus,delta}`
  - `@text.uri` -> `@string.special.url` (outside markup)
  - `@preproc` -> `@keyword.directive`
  - `@define` -> `@keyword.directive`(`.define`?)
  - `@storageclass` -> `@keyword.storage`
  - `@conditional` -> `@keyword.conditional`
  - `@debug` -> `@keyword.debug`
  - `@exception` -> `@keyword.exception`
  - `@include` -> `@keyword.import`
  - `@repeat` -> `@keyword.repeat`

* cleanup

  - remove some redundant `@conceal` (but still allow it for conceal-only patterns)
  - remove obsolete `@error` (syntax linting is out of scope for this repo)
  - sort, cleanup capture list in `CONTRIBUTING.md`
---
 queries/java/highlights.scm | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'queries/java')

diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm
index 27f139ec2..4ff56641d 100644
--- a/queries/java/highlights.scm
+++ b/queries/java/highlights.scm
@@ -7,30 +7,30 @@
 ; Methods
 
 (method_declaration
-  name: (identifier) @method)
+  name: (identifier) @function.method)
 (method_invocation
-  name: (identifier) @method.call)
+  name: (identifier) @function.method.call)
 
 (super) @function.builtin
 
 ; Parameters
 
 (formal_parameter
-  name: (identifier) @parameter)
+  name: (identifier) @variable.parameter)
 
 (catch_formal_parameter
-  name: (identifier) @parameter)
+  name: (identifier) @variable.parameter)
 
 (spread_parameter
  (variable_declarator
-   name: (identifier) @parameter)) ; int... foo
+   name: (identifier) @variable.parameter)) ; int... foo
 
 ;; Lambda parameter
 
-(inferred_parameters (identifier) @parameter) ; (x,y) -> ...
+(inferred_parameters (identifier) @variable.parameter) ; (x,y) -> ...
 
 (lambda_expression
-    parameters: (identifier) @parameter) ; x -> ...
+    parameters: (identifier) @variable.parameter) ; x -> ...
 
 ; Operators
 
@@ -107,10 +107,10 @@
 
 (field_declaration
   declarator: (variable_declarator
-    name: (identifier) @field))
+    name: (identifier) @variable.member))
 
 (field_access
-  field: (identifier) @field)
+  field: (identifier) @variable.member)
 
 [
   (boolean_type)
@@ -153,7 +153,7 @@
 [
   (decimal_floating_point_literal)
   (hex_floating_point_literal)
-] @float
+] @number.float
 
 [
   (true)
@@ -204,7 +204,7 @@
 [
   "transient"
   "volatile"
-] @storageclass
+] @keyword.storage
 
 [
   "return"
@@ -222,9 +222,9 @@
   "else"
   "switch"
   "case"
-] @conditional
+] @keyword.conditional
 
-(ternary_expression ["?" ":"] @conditional.ternary)
+(ternary_expression ["?" ":"] @keyword.conditional.ternary)
 
 ; Loops
 
@@ -234,7 +234,7 @@
   "do"
   "continue"
   "break"
-] @repeat
+] @keyword.repeat
 
 ; Includes
 
@@ -247,7 +247,7 @@
   "provides"
   "requires"
   "uses"
-] @include
+] @keyword.import
 
 ; Punctuation
 
@@ -277,7 +277,7 @@
   "finally"
   "try"
   "catch"
-] @exception
+] @keyword.exception
 
 ; Labels
 
-- 
cgit v1.2.3-70-g09d2