diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2023-12-24 10:00:20 +0100 |
|---|---|---|
| committer | Christian Clason <c.clason@uni-graz.at> | 2024-01-19 16:58:37 +0100 |
| commit | 1ae9b0e4558fe7868f8cda2db65239cfb14836d0 (patch) | |
| tree | 4eea14b40b8b81d9388fb35cbc9e35b341a75c98 /queries/verilog | |
| parent | chore(tests): consistent captures (diff) | |
| download | nvim-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/verilog')
| -rw-r--r-- | queries/verilog/highlights.scm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/queries/verilog/highlights.scm b/queries/verilog/highlights.scm index 6d27863f6..1c6e578f6 100644 --- a/queries/verilog/highlights.scm +++ b/queries/verilog/highlights.scm @@ -66,20 +66,20 @@ "forever" "initial" "while" -] @repeat +] @keyword.repeat [ "if" "else" (case_keyword) "endcase" -] @conditional +] @keyword.conditional (comment) @comment @spell (include_compiler_directive) @constant.macro (package_import_declaration - "import" @include) + "import" @keyword.import) (package_import_declaration (package_import_item @@ -162,14 +162,14 @@ (simple_identifier) @type) (method_call_body - (method_identifier) @field) + (method_identifier) @variable.member) (interface_identifier (simple_identifier) @type) (modport_identifier (modport_identifier - (simple_identifier) @field)) + (simple_identifier) @variable.member)) (net_port_type1 (simple_identifier) @type) @@ -182,9 +182,9 @@ [ (default_nettype_compiler_directive) (timescale_compiler_directive) -] @preproc +] @keyword.directive -(include_compiler_directive) @include +(include_compiler_directive) @keyword.import ; begin/end label (seq_block @@ -212,7 +212,7 @@ "new" @constructor) (parameter_identifier - (simple_identifier) @parameter) + (simple_identifier) @variable.parameter) [ (integral_number) @@ -258,12 +258,12 @@ (task_identifier (task_identifier - (simple_identifier) @method)) + (simple_identifier) @function.method)) ;;TODO: fixme ;(assignment_pattern_expression ;(assignment_pattern - ;(parameter_identifier) @field)) + ;(parameter_identifier) @variable.member)) (type_declaration (data_type ["packed"] @type.qualifier)) @@ -290,10 +290,10 @@ (struct_union_member (list_of_variable_decl_assignments (variable_decl_assignment - (simple_identifier) @field))) + (simple_identifier) @variable.member))) (member_identifier - (simple_identifier) @field) + (simple_identifier) @variable.member) (struct_union_member (data_type_or_void |
