From 1df3f5ec6aca24cbe7b78ead5c37ad06a65c84e8 Mon Sep 17 00:00:00 2001 From: Lewis Russell Date: Thu, 23 Feb 2023 17:05:20 +0000 Subject: feat(treesitter): upstream foldexpr from nvim-treesitter --- runtime/queries/vim/folds.scm | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 runtime/queries/vim/folds.scm (limited to 'runtime/queries/vim') diff --git a/runtime/queries/vim/folds.scm b/runtime/queries/vim/folds.scm new file mode 100644 index 0000000000..4c99735836 --- /dev/null +++ b/runtime/queries/vim/folds.scm @@ -0,0 +1,4 @@ +[ + (if_statement) + (function_definition) +] @fold -- cgit From 98e051783c26239a47c5cd643e9aea7146b097bd Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Fri, 3 Mar 2023 14:27:30 +0100 Subject: feat(treesitter): bundle query parser and queries (#22483) skip injections for now --- runtime/queries/vim/injections.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'runtime/queries/vim') diff --git a/runtime/queries/vim/injections.scm b/runtime/queries/vim/injections.scm index fdd025bfd9..b53643dc1a 100644 --- a/runtime/queries/vim/injections.scm +++ b/runtime/queries/vim/injections.scm @@ -24,5 +24,5 @@ "patchexpr" "pex" "charconvert" "ccv")) -(comment) @comment -(line_continuation_comment) @comment +; (comment) @comment +; (line_continuation_comment) @comment -- cgit From ddd257f75301a50c177fc24a693d39a45b47a689 Mon Sep 17 00:00:00 2001 From: Lewis Russell Date: Wed, 8 Mar 2023 11:03:11 +0000 Subject: feat(treesitter): use upstream format for injection queries --- runtime/queries/vim/injections.scm | 46 +++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 13 deletions(-) (limited to 'runtime/queries/vim') diff --git a/runtime/queries/vim/injections.scm b/runtime/queries/vim/injections.scm index b53643dc1a..50f0190112 100644 --- a/runtime/queries/vim/injections.scm +++ b/runtime/queries/vim/injections.scm @@ -1,18 +1,33 @@ -(lua_statement (script (body) @lua)) -(lua_statement (chunk) @lua) -(ruby_statement (script (body) @ruby)) -(ruby_statement (chunk) @ruby) -(python_statement (script (body) @python)) -(python_statement (chunk) @python) +((lua_statement (script (body) @injection.content)) + (#set! injection.language "lua")) + +((lua_statement (chunk) @injection.content) + (#set! injection.language "lua")) + +((ruby_statement (script (body) @injection.content)) + (#set! injection.language "ruby")) + +((ruby_statement (chunk) @injection.content) + (#set! injection.language "ruby")) + +((python_statement (script (body) @injection.content)) + (#set! injection.language "python")) + +((python_statement (chunk) @injection.content) + (#set! injection.language "python")) + ;; If we support perl at some point... -;; (perl_statement (script (body) @perl)) -;; (perl_statement (chunk) @perl) +;; ((perl_statement (script (body) @injection.content)) +;; (#set! injection.language "perl")) +;; ((perl_statement (chunk) @injection.content) +;; (#set! injection.language "perl")) -(autocmd_statement (pattern) @regex) +((autocmd_statement (pattern) @injection.content) + (#set! injection.language "regex")) ((set_item option: (option_name) @_option - value: (set_value) @vim) + value: (set_value) @injection.content) (#any-of? @_option "includeexpr" "inex" "printexpr" "pexpr" @@ -22,7 +37,12 @@ "foldexpr" "fde" "diffexpr" "dex" "patchexpr" "pex" - "charconvert" "ccv")) + "charconvert" "ccv") + (#set! injection.language "vim")) + + +; ((comment) @injection.content +; (#set! injection.language "comment")) -; (comment) @comment -; (line_continuation_comment) @comment +; ((line_continuation_comment) @injection.content +; (#set! injection.language "comment")) -- cgit From 2a298f2e48eb081f2e3b58068af589b82fe76a18 Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Fri, 31 Mar 2023 16:11:17 +0200 Subject: fix(treesitter): update queries from nvim-treesitter remove self-injection for C preprocessor macros (can be very slow) --- runtime/queries/vim/highlights.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/queries/vim') diff --git a/runtime/queries/vim/highlights.scm b/runtime/queries/vim/highlights.scm index 239b0a0b37..ce25b13b9f 100644 --- a/runtime/queries/vim/highlights.scm +++ b/runtime/queries/vim/highlights.scm @@ -271,7 +271,7 @@ ":" ] @punctuation.delimiter -(ternary_expression ["?" ":"] @conditional) +(ternary_expression ["?" ":"] @conditional.ternary) ; Options ((set_value) @number -- cgit From c97de026e357dec0bed034af3b54abf10966200b Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Sat, 13 May 2023 12:50:40 +0200 Subject: fix(treesitter): update vimdoc and vimscript queries --- runtime/queries/vim/highlights.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/queries/vim') diff --git a/runtime/queries/vim/highlights.scm b/runtime/queries/vim/highlights.scm index ce25b13b9f..09188ddb68 100644 --- a/runtime/queries/vim/highlights.scm +++ b/runtime/queries/vim/highlights.scm @@ -275,7 +275,7 @@ ; Options ((set_value) @number - (#match? @number "^[0-9]+(\.[0-9]+)?$")) + (#lua-match? @number "^[%d]+(%.[%d]+)?$")) (inv_option "!" @operator) (set_item "?" @operator) -- cgit