aboutsummaryrefslogtreecommitdiffstats
path: root/queries/javascript/highlights.scm
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2023-12-24 10:00:20 +0100
committerChristian Clason <c.clason@uni-graz.at>2024-01-19 16:58:37 +0100
commit1ae9b0e4558fe7868f8cda2db65239cfb14836d0 (patch)
tree4eea14b40b8b81d9388fb35cbc9e35b341a75c98 /queries/javascript/highlights.scm
parentchore(tests): consistent captures (diff)
downloadnvim-treesitter-1ae9b0e4558fe7868f8cda2db65239cfb14836d0.tar
nvim-treesitter-1ae9b0e4558fe7868f8cda2db65239cfb14836d0.tar.gz
nvim-treesitter-1ae9b0e4558fe7868f8cda2db65239cfb14836d0.tar.bz2
nvim-treesitter-1ae9b0e4558fe7868f8cda2db65239cfb14836d0.tar.lz
nvim-treesitter-1ae9b0e4558fe7868f8cda2db65239cfb14836d0.tar.xz
nvim-treesitter-1ae9b0e4558fe7868f8cda2db65239cfb14836d0.tar.zst
nvim-treesitter-1ae9b0e4558fe7868f8cda2db65239cfb14836d0.zip
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`
Diffstat (limited to 'queries/javascript/highlights.scm')
-rw-r--r--queries/javascript/highlights.scm20
1 files changed, 10 insertions, 10 deletions
diff --git a/queries/javascript/highlights.scm b/queries/javascript/highlights.scm
index 8fc69e6c7..e757dd2bd 100644
--- a/queries/javascript/highlights.scm
+++ b/queries/javascript/highlights.scm
@@ -1,55 +1,55 @@
; inherits: ecma,jsx
;;; Parameters
-(formal_parameters (identifier) @parameter)
+(formal_parameters (identifier) @variable.parameter)
(formal_parameters
(rest_pattern
- (identifier) @parameter))
+ (identifier) @variable.parameter))
;; ({ a }) => null
(formal_parameters
(object_pattern
- (shorthand_property_identifier_pattern) @parameter))
+ (shorthand_property_identifier_pattern) @variable.parameter))
;; ({ a = b }) => null
(formal_parameters
(object_pattern
(object_assignment_pattern
- (shorthand_property_identifier_pattern) @parameter)))
+ (shorthand_property_identifier_pattern) @variable.parameter)))
;; ({ a: b }) => null
(formal_parameters
(object_pattern
(pair_pattern
- value: (identifier) @parameter)))
+ value: (identifier) @variable.parameter)))
;; ([ a ]) => null
(formal_parameters
(array_pattern
- (identifier) @parameter))
+ (identifier) @variable.parameter))
;; ({ a } = { a }) => null
(formal_parameters
(assignment_pattern
(object_pattern
- (shorthand_property_identifier_pattern) @parameter)))
+ (shorthand_property_identifier_pattern) @variable.parameter)))
;; ({ a = b } = { a }) => null
(formal_parameters
(assignment_pattern
(object_pattern
(object_assignment_pattern
- (shorthand_property_identifier_pattern) @parameter))))
+ (shorthand_property_identifier_pattern) @variable.parameter))))
;; a => null
(arrow_function
- parameter: (identifier) @parameter)
+ parameter: (identifier) @variable.parameter)
;; optional parameters
(formal_parameters
(assignment_pattern
- left: (identifier) @parameter))
+ left: (identifier) @variable.parameter))
;; punctuation
(optional_chain) @punctuation.delimiter