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/bash/highlights.scm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'queries/bash')

diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index 4ffae437e..033f9fbee 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -70,7 +70,7 @@
  "case"
  "in"
  "esac"
-] @conditional
+] @keyword.conditional
 
 [
  "for"
@@ -79,7 +79,7 @@
  "select"
  "until"
  "while"
-] @repeat
+] @keyword.repeat
 
 [
   "declare"
@@ -115,7 +115,7 @@
 
 (arithmetic_expansion "," @punctuation.delimiter)
 
-(ternary_expression [ "?" ":" ] @conditional.ternary)
+(ternary_expression [ "?" ":" ] @keyword.conditional.ternary)
 
 (binary_expression operator: _ @operator)
 (unary_expression operator: _ @operator)
@@ -140,8 +140,8 @@
 
 (command
   argument: [
-             (word) @parameter
-             (concatenation (word) @parameter)
+             (word) @variable.parameter
+             (concatenation (word) @variable.parameter)
              ])
 
 (number) @number
@@ -149,7 +149,7 @@
  (#lua-match? @number "^[0-9]+$"))
 
 (file_redirect
-  destination: (word) @parameter)
+  destination: (word) @variable.parameter)
 
 (file_descriptor) @operator
 
@@ -175,12 +175,12 @@
  (#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
 
 (case_item
-  value: (word) @parameter)
+  value: (word) @variable.parameter)
 
 [
   (regex)
   (extglob_pattern)
-] @string.regex
+] @string.regexp
 
-((program . (comment) @preproc)
- (#lua-match? @preproc "^#!/"))
+((program . (comment) @keyword.directive)
+ (#lua-match? @keyword.directive "^#!/"))
-- 
cgit v1.2.3-70-g09d2