nix-community/nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-12-17 06:21:13 +01:00
Code Activity

plugins/treesitter: simplify nested expressions

Browse source 
Looks like we can actually nest this inside the parenthesized_expression
to simplify a small amount.
This commit is contained in:
Austin Horstman 2025-12-12 10:12:22 -06:00
parent d5b2ba8f2a
commit 993a8b4eb0
1 changed files with 24 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

60
plugins/by-name/treesitter/injections.scm
View file

@ -24,26 +24,23 @@
(string_expression (string_fragment) @injection.content) (string_expression (string_fragment) @injection.content)
(indented_string_expression (string_fragment) @injection.content) (indented_string_expression (string_fragment) @injection.content)
; Function wrappers (handles 1-2 levels of nesting) ; Function wrappers (handles 1-3 levels of nesting)
; extraConfigLua = mkIf true "..." ; extraConfigLua = mkIf true "..."
; extraConfigLua = mkIf true (mkOverride 10 "...") ; extraConfigLua = mkIf true (mkOverride 10 "...")
; extraConfigLua = mkIf true (mkOverride 10 (mkDefault "..."))
(apply_expression argument: [ (apply_expression argument: [
(string_expression (string_fragment) @injection.content) (string_expression (string_fragment) @injection.content)
(indented_string_expression (string_fragment) @injection.content) (indented_string_expression (string_fragment) @injection.content)
(parenthesized_expression (apply_expression argument: [ (parenthesized_expression (apply_expression argument: [
(string_expression (string_fragment) @injection.content) (string_expression (string_fragment) @injection.content)
(indented_string_expression (string_fragment) @injection.content) (indented_string_expression (string_fragment) @injection.content)
(parenthesized_expression (apply_expression argument: [
(string_expression (string_fragment) @injection.content)
(indented_string_expression (string_fragment) @injection.content)
]))
])) ]))
]) ])
; Three-level nested wrappers
; extraConfigLua = mkIf true (mkOverride 10 (mkDefault "..."))
(apply_expression argument: (parenthesized_expression (apply_expression argument:
(parenthesized_expression (apply_expression argument: [
(string_expression (string_fragment) @injection.content)
(indented_string_expression (string_fragment) @injection.content)
])))))
; Lists (with or without wrapped items) ; Lists (with or without wrapped items)
; extraConfigLua = mkMerge [ "..." "..." ] ; extraConfigLua = mkMerge [ "..." "..." ]
; extraConfigLua = mkMerge [ (mkIf true "...") "..." ] ; extraConfigLua = mkMerge [ (mkIf true "...") "..." ]
@ -85,26 +82,23 @@
(string_expression (string_fragment) @injection.content) (string_expression (string_fragment) @injection.content)
(indented_string_expression (string_fragment) @injection.content) (indented_string_expression (string_fragment) @injection.content)
; Function wrappers (handles 1-2 levels of nesting) ; Function wrappers (handles 1-3 levels of nesting)
; luaConfig = { pre = mkIf true "..." } ; luaConfig = { pre = mkIf true "..." }
; luaConfig = { pre = mkIf true (mkOverride 10 "...") } ; luaConfig = { pre = mkIf true (mkOverride 10 "...") }
; luaConfig = { pre = mkIf true (mkOverride 10 (mkDefault "...")) }
(apply_expression argument: [ (apply_expression argument: [
(string_expression (string_fragment) @injection.content) (string_expression (string_fragment) @injection.content)
(indented_string_expression (string_fragment) @injection.content) (indented_string_expression (string_fragment) @injection.content)
(parenthesized_expression (apply_expression argument: [ (parenthesized_expression (apply_expression argument: [
(string_expression (string_fragment) @injection.content) (string_expression (string_fragment) @injection.content)
(indented_string_expression (string_fragment) @injection.content) (indented_string_expression (string_fragment) @injection.content)
(parenthesized_expression (apply_expression argument: [
(string_expression (string_fragment) @injection.content)
(indented_string_expression (string_fragment) @injection.content)
]))
])) ]))
]) ])
; Three-level nested wrappers
; luaConfig = { pre = mkIf true (mkOverride 10 (mkDefault "...")) }
(apply_expression argument: (parenthesized_expression (apply_expression argument:
(parenthesized_expression (apply_expression argument: [
(string_expression (string_fragment) @injection.content)
(indented_string_expression (string_fragment) @injection.content)
])))))
; Let expressions ; Let expressions
; luaConfig = { pre = let x = ...; in ''...'' } ; luaConfig = { pre = let x = ...; in ''...'' }
(let_expression body: [ (let_expression body: [
@ -129,26 +123,23 @@
(string_expression (string_fragment) @injection.content) (string_expression (string_fragment) @injection.content)
(indented_string_expression (string_fragment) @injection.content) (indented_string_expression (string_fragment) @injection.content)
; Function wrappers (handles 1-2 levels of nesting) ; Function wrappers (handles 1-3 levels of nesting)
; luaConfig.pre = mkIf true "..." ; luaConfig.pre = mkIf true "..."
; luaConfig.content = mkIf true (mkOverride 10 "...") ; luaConfig.content = mkIf true (mkOverride 10 "...")
; luaConfig.post = mkIf true (mkOverride 10 (mkDefault "..."))
(apply_expression argument: [ (apply_expression argument: [
(string_expression (string_fragment) @injection.content) (string_expression (string_fragment) @injection.content)
(indented_string_expression (string_fragment) @injection.content) (indented_string_expression (string_fragment) @injection.content)
(parenthesized_expression (apply_expression argument: [ (parenthesized_expression (apply_expression argument: [
(string_expression (string_fragment) @injection.content) (string_expression (string_fragment) @injection.content)
(indented_string_expression (string_fragment) @injection.content) (indented_string_expression (string_fragment) @injection.content)
(parenthesized_expression (apply_expression argument: [
(string_expression (string_fragment) @injection.content)
(indented_string_expression (string_fragment) @injection.content)
]))
])) ]))
]) ])
; Three-level nested wrappers
; luaConfig.post = mkIf true (mkOverride 10 (mkDefault "..."))
(apply_expression argument: (parenthesized_expression (apply_expression argument:
(parenthesized_expression (apply_expression argument: [
(string_expression (string_fragment) @injection.content)
(indented_string_expression (string_fragment) @injection.content)
])))))
; Let expressions ; Let expressions
; luaConfig.pre = let x = ...; in ''...'' ; luaConfig.pre = let x = ...; in ''...''
(let_expression body: [ (let_expression body: [
@ -172,26 +163,23 @@
(string_expression (string_fragment) @injection.content) (string_expression (string_fragment) @injection.content)
(indented_string_expression (string_fragment) @injection.content) (indented_string_expression (string_fragment) @injection.content)
; Function wrappers (handles 1-2 levels of nesting) ; Function wrappers (handles 1-3 levels of nesting)
; extraConfigVim = mkIf true "..." ; extraConfigVim = mkIf true "..."
; extraConfigVim = mkIf true (mkOverride 10 "...") ; extraConfigVim = mkIf true (mkOverride 10 "...")
; extraConfigVim = mkIf true (mkOverride 10 (mkDefault "..."))
(apply_expression argument: [ (apply_expression argument: [
(string_expression (string_fragment) @injection.content) (string_expression (string_fragment) @injection.content)
(indented_string_expression (string_fragment) @injection.content) (indented_string_expression (string_fragment) @injection.content)
(parenthesized_expression (apply_expression argument: [ (parenthesized_expression (apply_expression argument: [
(string_expression (string_fragment) @injection.content) (string_expression (string_fragment) @injection.content)
(indented_string_expression (string_fragment) @injection.content) (indented_string_expression (string_fragment) @injection.content)
(parenthesized_expression (apply_expression argument: [
(string_expression (string_fragment) @injection.content)
(indented_string_expression (string_fragment) @injection.content)
]))
])) ]))
]) ])
; Three-level nested wrappers
; extraConfigVim = mkIf true (mkOverride 10 (mkDefault "..."))
(apply_expression argument: (parenthesized_expression (apply_expression argument:
(parenthesized_expression (apply_expression argument: [
(string_expression (string_fragment) @injection.content)
(indented_string_expression (string_fragment) @injection.content)
])))))
; Lists (with or without wrapped items) ; Lists (with or without wrapped items)
; extraConfigVim = mkMerge [ "..." "..." ] ; extraConfigVim = mkMerge [ "..." "..." ]
; extraConfigVim = mkMerge [ (mkIf true "...") "..." ] ; extraConfigVim = mkMerge [ (mkIf true "...") "..." ]