From 27b4dc9fb03297d03ae96ba2b242489d74f01d88 Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Thu, 23 Apr 2026 22:48:23 +0200 Subject: [PATCH] treesitter: rename queries content to query --- docs/manual/configuring/queries.md | 2 +- modules/plugins/languages/go.nix | 2 +- modules/plugins/languages/tera.nix | 2 +- modules/plugins/treesitter/config.nix | 12 ++++++------ modules/plugins/treesitter/treesitter.nix | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/manual/configuring/queries.md b/docs/manual/configuring/queries.md index e6e544f7..866fbd8e 100644 --- a/docs/manual/configuring/queries.md +++ b/docs/manual/configuring/queries.md @@ -22,7 +22,7 @@ foo = mkLuaInline '' vim.treesitter.queries = [{ type = "injections"; filetypes = ["nix"]; - content = '' + query = '' ;; extends ((apply_expression diff --git a/modules/plugins/languages/go.nix b/modules/plugins/languages/go.nix index afe9d1b2..1e644bac 100644 --- a/modules/plugins/languages/go.nix +++ b/modules/plugins/languages/go.nix @@ -287,7 +287,7 @@ in { { type = "injections"; filetypes = ["gotmpl"]; - content = '' + query = '' ;; extends ((text) @injection.content diff --git a/modules/plugins/languages/tera.nix b/modules/plugins/languages/tera.nix index 3135df9f..e9388f5f 100644 --- a/modules/plugins/languages/tera.nix +++ b/modules/plugins/languages/tera.nix @@ -57,7 +57,7 @@ in { { type = "injections"; filetypes = ["tera"]; - content = '' + query = '' ;; extends ((content) @injection.content diff --git a/modules/plugins/treesitter/config.nix b/modules/plugins/treesitter/config.nix index b2b4cc99..862a5ed8 100644 --- a/modules/plugins/treesitter/config.nix +++ b/modules/plugins/treesitter/config.nix @@ -73,29 +73,29 @@ in { grouped = foldl' ( - acc: query: + acc: entry: foldl' ( inner: filetype: let - path = "queries/${filetype}/${query.type}.scm"; + path = "queries/${filetype}/${entry.type}.scm"; prev = inner.${path} or ""; in inner // { - ${path} = prev + query.content; + ${path} = prev + entry.query; } ) acc - query.filetypes + entry.filetypes ) {} cfg.queries; files = mapAttrsToList - (path: content: { + (path: query: { name = path; - path = pkgs.writeText path content; + path = pkgs.writeText path query; }) grouped; in diff --git a/modules/plugins/treesitter/treesitter.nix b/modules/plugins/treesitter/treesitter.nix index d10a3eaf..9d543621 100644 --- a/modules/plugins/treesitter/treesitter.nix +++ b/modules/plugins/treesitter/treesitter.nix @@ -17,7 +17,7 @@ default = []; description = "The filetypes for which the query should be registered."; }; - content = mkOption { + query = mkOption { type = lines; description = "The queries scm script."; };