NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-04-27 11:55:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

languages/nix: fix treesitter nvf query for vim.treesitter.queries

Browse source
This commit is contained in:
Snoweuph 2026-04-23 22:59:05 +02:00 • committed by Ching Pei Yang
commit cee03d0c97
2 changed files with 30 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

66
modules/plugins/languages/nix.nix
View file

@ -132,53 +132,41 @@ in {
enable = true;
grammars = [cfg.treesitter.package];
queries = [
# vim.treesitter.queries.*.content
# query = ''; -> query
{
type = "injections";
filetypes = ["nix"];
content = ''
query = ''
;; extends
((binding
attrpath: (attrpath
(identifier) @_a
(identifier) @_b
(identifier)? @_c)
(#eq? @_a "vim")
(#any-of? @_b "treesitter")
(#any-of? @_c "queries")
expression: (attrset_expression
(binding_set
(binding
attrpath: (attrpath
(identifier) @_queries)
(#eq? @_queries "queries")
expression: (list_expression
(attrset_expression
(binding_set
(binding
attrpath: (attrpath
(identifier) @_field)
(#eq? @_field "content")
expression: [
(string_expression
(string_fragment) @injection.content)
(indented_string_expression
(string_fragment) @injection.content)
]
(#set! injection.language "query")
(#set! injection.combined))))))))))
(identifier) @_path)
(#eq? @_path "query")
expression: [
(string_expression
((string_fragment) @injection.content
(#set! injection.language "query")))
(indented_string_expression
((string_fragment) @injection.content
(#set! injection.language "query")))
(apply_expression
argument: [
(string_expression
((string_fragment) @injection.content
(#set! injection.language "query")))
(indented_string_expression
((string_fragment) @injection.content
(#set! injection.language "query")))
])
]))
'';
}
# mkLuaInline, entryAnywhere, entryBefore, entryAfter = lua
# mkLuaInline, entryAnywhere, entryBefore, entryAfter -> lua
{
type = "injections";
filetypes = ["nix"];
content = ''
query = ''
;; extends
((apply_expression
@ -187,8 +175,8 @@ in {
(#any-of? @_func "mkLuaInline" "entryAnywhere"))
argument: (indented_string_expression
(string_fragment) @injection.content))
(#set! injection.language "lua")
(#set! injection.combined))
(#set! injection.language "lua")
(#set! injection.combined))
((apply_expression
function: (apply_expression
@ -198,8 +186,8 @@ in {
argument: (_))
argument: (indented_string_expression
(string_fragment) @injection.content))
(#set! injection.language "lua")
(#set! injection.combined))
(#set! injection.language "lua")
(#set! injection.combined))
'';
}
];