benbot/nvim-treesitter
1
0
Fork 0
mirror of https://github.com/nvim-treesitter/nvim-treesitter.git synced 2026-07-01 11:06:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(nix): match writers in nested attrpaths

Browse source 
The current Nix injections don't mark this as bash:

```nix
pkgs.writers.writeBash "" ''
  echo Hello, world!
''
```

but do mark this as bash:

```nix
writers.............................writeBash "" ''
  echo hi
''
```

(and similar for other languages). Note that in
order to solve this issue, I had to swap from
Lua patterns to Vim regexps, which I know is less
efficient. Unfortunately Lua patterns don't let you
use modifiers on groups, so I swapped.
This commit is contained in:
Sam 2026-01-24 18:48:20 -07:00
parent 81aca2f981
commit eb3911d052
No known key found for this signature in database
GPG key ID: 07C4B9795517E3B4
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
runtime/queries/nix/injections.scm
View file

@ -136,7 +136,7 @@
((string_fragment) @injection.content
(#set! injection.language "bash")))
])
(#lua-match? @_func "^%a*%.*writeBash%a*$")
(#match? @_func "^([a-zA-Z]+.)*writeBash[a-zA-Z]*$")
(#set! injection.combined))
((apply_expression
@ -150,7 +150,7 @@
((string_fragment) @injection.content
(#set! injection.language "bash")))
])
(#lua-match? @_func "^%a*%.*writeDash%a*$")
(#match? @_func "^([a-zA-Z]+.)*writeDash[a-zA-Z]*$")
(#set! injection.combined))
((apply_expression
@ -178,7 +178,7 @@
((string_fragment) @injection.content
(#set! injection.language "fish")))
])
(#lua-match? @_func "^%a*%.*writeFish%a*$")
(#match? @_func "^([a-zA-Z]+.)*writeFish[a-zA-Z]*$")
(#set! injection.combined))
((apply_expression
@ -193,7 +193,7 @@
((string_fragment) @injection.content
(#set! injection.language "haskell")))
])
(#lua-match? @_func "^%a*%.*writeHaskell%a*$")
(#match? @_func "^([a-zA-Z]+.)*writeHaskell[a-zA-Z]*$")
(#set! injection.combined))
((apply_expression
@ -207,7 +207,7 @@
((string_fragment) @injection.content
(#set! injection.language "javascript")))
])
(#lua-match? @_func "^%a*%.*writeJS%a*$")
(#match? @_func "^([a-zA-Z]+.)*writeJS[a-zA-Z]*$")
(#set! injection.combined))
((apply_expression
@ -221,7 +221,7 @@
((string_fragment) @injection.content
(#set! injection.language "perl")))
])
(#lua-match? @_func "^%a*%.*writePerl%a*$")
(#match? @_func "^([a-zA-Z]+.)*writePerl[a-zA-Z]*$")
(#set! injection.combined))
((apply_expression
@ -235,7 +235,7 @@
((string_fragment) @injection.content
(#set! injection.language "python")))
])
(#lua-match? @_func "^%a*%.*writePy%a*%d*%a*$")
(#match? @_func "^([a-zA-Z]+.)*writePy[a-zA-Z]*[0-9]*[a-zA-Z]*$")
(#set! injection.combined))
((apply_expression
@ -248,7 +248,7 @@
((string_fragment) @injection.content
(#set! injection.language "rust")))
])
(#lua-match? @_func "^%a*%.*writeRust%a*$")
(#match? @_func "^([a-zA-Z]+.)*writeRust[a-zA-Z]*$")
(#set! injection.combined))
; (runTest) testScript