From 11e88f698ac27081e2d238289474c4b8780007d3 Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Wed, 17 Aug 2022 11:09:14 +0200 Subject: [PATCH] update vim parser and queries --- lockfile.json | 2 +- queries/vim/highlights.scm | 6 +++++- queries/vim/injections.scm | 12 ++++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lockfile.json b/lockfile.json index 59b11b7ad..f81e20c6d 100644 --- a/lockfile.json +++ b/lockfile.json @@ -354,7 +354,7 @@ "revision": "8f6b1f357d1231c420404b5f7a368a73c25adfa2" }, "vim": { - "revision": "2dbe41988636062fe5c00aefe75a47a4d849d9d2" + "revision": "9f674e9178ece2a3827328a4e05568eb861c0d01" }, "vue": { "revision": "91fe2754796cd8fba5f229505a23fa08f3546c06" diff --git a/queries/vim/highlights.scm b/queries/vim/highlights.scm index fea600f01..210705597 100644 --- a/queries/vim/highlights.scm +++ b/queries/vim/highlights.scm @@ -25,6 +25,8 @@ "in" "while" "endwhile" + "break" + "continue" ] @repeat [ @@ -34,7 +36,7 @@ ;; Function related (function_declaration name: (_) @function) -(call_expression function: (identifier) @function.call) +(call_expression function: (identifier) @function) (parameters (identifier) @parameter) (default_parameter (identifier) @parameter) @@ -149,6 +151,8 @@ (pattern) @string.special (pattern_multi) @string.regex (filename) @string +(heredoc (body) @string) +((heredoc (parameter) @keyword)) ((scoped_identifier (scope) @_scope . (identifier) @boolean) (#eq? @_scope "v:") diff --git a/queries/vim/injections.scm b/queries/vim/injections.scm index 08e74e405..cddcbe418 100644 --- a/queries/vim/injections.scm +++ b/queries/vim/injections.scm @@ -1,8 +1,12 @@ -(lua_statement . (_) @lua) -(ruby_statement . (_) @ruby) -(python_statement . (_) @python) +(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) ;; If we support perl at some point... -;; (perl_statement . (_) @perl) +;; (perl_statement (script (body) @perl)) +;; (perl_statement (chunk) @perl) (autocmd_statement (pattern) @regex)