From de003000a287c501a6650a1ddd3be80ee34278d4 Mon Sep 17 00:00:00 2001 From: Steven Xu Date: Fri, 10 Oct 2025 20:47:09 +1100 Subject: feat(tmux)!: update parser and highlights Breaking changes: - Node `(variable)` was renamed to `(expr_double_quotes)`. - Node `(variable_raw)` was renamed to `(expr_single_quotes)`. - Node `(string)` was renamed to `(str_double_quotes)`. - Node `(raw_string)` was renamed to `(str_single_quotes)`. - Node `(raw_string_quote)` was removed. --- SUPPORTED_LANGUAGES.md | 2 +- lua/nvim-treesitter/parsers.lua | 4 ++-- runtime/queries/tmux/highlights.scm | 26 ++++++++++++++++++++------ 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md index 989187984..90df4eb87 100644 --- a/SUPPORTED_LANGUAGES.md +++ b/SUPPORTED_LANGUAGES.md @@ -300,7 +300,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` | | @steelsojka [thrift](https://github.com/tree-sitter-grammars/tree-sitter-thrift) | unstable | `HFIJL` | | @amaanq, @duskmoon314 [tiger](https://github.com/ambroisie/tree-sitter-tiger) | unstable | `HFIJL` | | @ambroisie [tlaplus](https://github.com/tlaplus-community/tree-sitter-tlaplus) | unstable | `HF JL` | | @ahelwer, @susliko -[tmux](https://github.com/Freed-Wu/tree-sitter-tmux) | unstable | `H  J ` | | @Freed-Wu +[tmux](https://github.com/Freed-Wu/tree-sitter-tmux) | unstable | `H  J ` | | @Freed-Wu, @stevenxxiu [todotxt](https://github.com/arnarg/tree-sitter-todotxt) | unstable | `H    ` | | @arnarg [toml](https://github.com/tree-sitter-grammars/tree-sitter-toml) | unstable | `HFIJL` | | @tk-shirasaka [tsv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | unstable | `H    ` | | @amaanq diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua index 26f8ca2af..aba7016a1 100644 --- a/lua/nvim-treesitter/parsers.lua +++ b/lua/nvim-treesitter/parsers.lua @@ -2372,10 +2372,10 @@ return { }, tmux = { install_info = { - revision = '0252ecd080016e45e6305ef1a943388f5ae2f4b4', + revision = 'a2936cb2579f7723b5744563c45bcefabc42fe47', url = 'https://github.com/Freed-Wu/tree-sitter-tmux', }, - maintainers = { '@Freed-Wu' }, + maintainers = { '@Freed-Wu', '@stevenxxiu' }, tier = 2, }, todotxt = { diff --git a/runtime/queries/tmux/highlights.scm b/runtime/queries/tmux/highlights.scm index 50da7d7d8..ea98dff06 100644 --- a/runtime/queries/tmux/highlights.scm +++ b/runtime/queries/tmux/highlights.scm @@ -1,19 +1,21 @@ -; Comments (comment) @comment @spell -; General [ - (string) - (raw_string) + "'" + (str_single_quotes) + (str_double_quotes) ] @string -(int) @number +(backslash_escape) @string.escape (path) @string.special.path +(int) @number + [ (option) (variable_name) + (variable_name_short) ] @variable (command_line_option) @variable.builtin @@ -21,7 +23,17 @@ ((option) @variable.builtin (#not-lua-match? @variable.builtin "^@")) -(command) @keyword +[ + (if_keyword) + (elif_keyword) + (else_keyword) + (endif_keyword) +] @keyword.conditional + +[ + (hidden_keyword) + (command) +] @keyword (source_file_directive (command) @keyword.import) @@ -33,6 +45,8 @@ "=" @operator [ + ";" + "';'" "," ":" ] @punctuation.delimiter -- cgit v1.2.3-70-g09d2