From 78b54eb7f6a9956d25a3911fa0dfd0cabfe2a4c5 Mon Sep 17 00:00:00 2001 From: Pham Huy Hoang Date: Wed, 3 May 2023 19:07:59 +0900 Subject: chore(injections)!: update injection syntax to 0.9 Since 0.9, @lang syntax is still available as fallback but will soon be deprecated. Because of that, new syntax should be adopted once 0.9 becomes the baseline requirements for nvim-treesitter - update health check - update doc --- queries/vim/injections.scm | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) (limited to 'queries/vim') diff --git a/queries/vim/injections.scm b/queries/vim/injections.scm index cddcbe418..553ac5e6a 100644 --- a/queries/vim/injections.scm +++ b/queries/vim/injections.scm @@ -1,18 +1,35 @@ -(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) -(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,6 +39,8 @@ "foldexpr" "fde" "diffexpr" "dex" "patchexpr" "pex" - "charconvert" "ccv")) + "charconvert" "ccv") + (#set! injection.language "vim")) -(comment) @comment +((comment) @injection.content + (#set! injection.language "comment")) -- cgit v1.2.3-70-g09d2