NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-04-26 19:37:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

languages/nix: add more nvf injections

Browse source
This commit is contained in:
Snoweuph 2026-04-19 18:37:19 +02:00
commit c4b940239b
No known key found for this signature in database
GPG key ID: BEFC41DA223CEC55
2 changed files with 50 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/manual/release-notes/rl-0.9.md
View file

@ -274,7 +274,7 @@
- Added {option}`vim.treesitter.queries` to support adding custom queries.
- Added injections for `vim.treesitter.queries.*.content` as `query` and
`mkLualine ""` as `lua`.
`mkLualine`, `entryAnywhere`, `entryBefore`, `entryAfter` as `lua`.
- Added `vim.lsp.presets.<name>` to contain LSP configurations. This allows for
more flexibility in nvf and reuse of LSPs across languages. Dropped

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

@ -138,44 +138,43 @@ in {
filetypes = ["nix"];
content = ''
;; 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")
((binding
attrpath: (attrpath
(identifier) @_a
(identifier) @_b
(identifier)? @_c)
(#eq? @_a "vim")
(#any-of? @_b "treesitter")
(#any-of? @_c "queries")
expression: (list_expression
(attrset_expression
(binding_set
(binding
attrpath: (attrpath
(identifier) @_field)
(#eq? @_field "content")
expression: (attrset_expression
(binding_set
(binding
attrpath: (attrpath
(identifier) @_queries)
(#eq? @_queries "queries")
expression: [
(string_expression
(string_fragment) @injection.content)
(indented_string_expression
(string_fragment) @injection.content)
]
expression: (list_expression
(attrset_expression
(binding_set
(binding
attrpath: (attrpath
(identifier) @_field)
(#eq? @_field "content")
(#set! injection.language "query")
(#set! injection.combined)))))))))
)
expression: [
(string_expression
(string_fragment) @injection.content)
(indented_string_expression
(string_fragment) @injection.content)
]
(#set! injection.language "query")
(#set! injection.combined))))))))))
'';
}
# mkLuaInline = lua
# mkLuaInline, entryAnywhere, entryBefore, entryAfter = lua
{
type = "injections";
filetypes = ["nix"];
@ -185,13 +184,22 @@ in {
((apply_expression
function: (variable_expression
name: (identifier) @_func
(#eq? @_func "mkLuaInline"))
(#any-of? @_func "mkLuaInline" "entryAnywhere"))
argument: (indented_string_expression
(string_fragment) @injection.content)
(string_fragment) @injection.content))
(#set! injection.language "lua")
(#set! injection.combined))
(#set! injection.language "lua")
(#set! injection.combined)))
((apply_expression
function: (apply_expression
function: (variable_expression
name: (identifier) @_func
(#any-of? @_func "entryBefore" "entryAfter"))
argument: (_))
argument: (indented_string_expression
(string_fragment) @injection.content))
(#set! injection.language "lua")
(#set! injection.combined))
'';
}
];