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/purescript/highlights.scm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'queries/purescript')

diff --git a/queries/purescript/highlights.scm b/queries/purescript/highlights.scm
index 3e3ec3cb8..247ea839e 100644
--- a/queries/purescript/highlights.scm
+++ b/queries/purescript/highlights.scm
@@ -5,7 +5,7 @@
   (integer)
   (exp_negation)
 ] @number
- (exp_literal (number)) @float
+ (exp_literal (number)) @number.float
  (char) @character
  [
    (string)
@@ -43,12 +43,12 @@
    "else"
    "case"
    "of"
- ] @conditional
+ ] @keyword.conditional
 
  [
    "import"
    "module"
- ] @include
+ ] @keyword.import
 
  [
    (operator)
@@ -74,10 +74,10 @@
  ] @operator
 
  (qualified_module (module) @constructor)
- (module) @namespace
- (qualified_type (module) @namespace)
- (qualified_variable (module) @namespace)
- (import (module) @namespace)
+ (module) @module
+ (qualified_type (module) @module)
+ (qualified_variable (module) @module)
+ (import (module) @module)
 
  [
    (where)
@@ -111,7 +111,7 @@
 
  ; `_` wildcards in if-then-else and case-of expressions,
  ; as well as record updates and operator sections
- (wildcard) @parameter
+ (wildcard) @variable.parameter
 
 ; ----------------------------------------------------------------------------
 ; Functions and variables
@@ -120,10 +120,10 @@
  (exp_apply . (exp_name (variable) @function))
  (exp_apply . (exp_name (qualified_variable (variable) @function)))
 
- (row_field (field_name) @field)
- (record_field (field_name) @field)
- (record_accessor (variable) @field)
- (exp_record_access (variable) @field)
+ (row_field (field_name) @variable.member)
+ (record_field (field_name) @variable.member)
+ (record_accessor (variable) @variable.member)
+ (exp_record_access (variable) @variable.member)
 
  (signature name: (variable) @type)
  (kind_declaration (class_name) @type)
-- 
cgit v1.2.3-70-g09d2