From 9e84b9bab7c5316beccf9460ef71785bc38ecca2 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 15 Dec 2025 21:17:25 -0600
Subject: [PATCH] plugins/treesitter: folding -> folding.enable

Just more consistent and intuitive.
---
 plugins/by-name/treesitter/default.nix        | 35 ++++++++++++++++---
 .../plugins/by-name/treesitter/default.nix    |  2 +-
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/plugins/by-name/treesitter/default.nix b/plugins/by-name/treesitter/default.nix
index d7c39dd2..fd21ce58 100644
--- a/plugins/by-name/treesitter/default.nix
+++ b/plugins/by-name/treesitter/default.nix
@@ -37,17 +37,17 @@ lib.nixvim.plugins.mkNeovimPlugin {
     {
       plugins.treesitter = {
         enable = true;
-        folding = true;
         highlight.enable = true;
         indent.enable = true;
+        folding.enable = true;
       };
     }
     ```
 
     Features are enabled via Neovim's native APIs:
-    - `folding` → Configures vim fold options to use `vim.treesitter.foldexpr()`
     - `highlight.enable` → Calls `vim.treesitter.start()` on FileType events
     - `indent.enable` → Sets `indentexpr` to use treesitter's indent function
+    - `folding.enable` → Configures vim fold options to use `vim.treesitter.foldexpr()`
 
     ## Installing Grammar Parsers
 
@@ -149,7 +149,34 @@ lib.nixvim.plugins.mkNeovimPlugin {
   };
 
   extraOptions = {
-    folding = lib.mkEnableOption "tree-sitter based folding";
+    folding = mkOption {
+      type =
+        let
+          foldingSubmodule = types.submodule {
+            options = {
+              enable = lib.mkEnableOption "tree-sitter based folding";
+            };
+          };
+        in
+        (types.either types.bool foldingSubmodule)
+        // {
+          inherit (foldingSubmodule) description getSubOptions;
+        };
+      visible = "transparent";
+      default = { };
+      description = "Tree-sitter based folding configuration.";
+      apply =
+        x:
+        if builtins.isBool x then
+          # TODO: Added 2025-12-18, remove after 26.11
+          lib.warn
+            "Passing a boolean to `${options.plugins.treesitter.folding}` is deprecated, use `${options.plugins.treesitter.folding}.enable`. Definitions: ${lib.options.showDefs options.plugins.treesitter.folding.definitionsWithLocations}"
+            {
+              enable = x;
+            }
+        else
+          x;
+    };
 
     highlight = {
       enable = lib.mkEnableOption "tree-sitter based syntax highlighting";
@@ -295,7 +322,7 @@ lib.nixvim.plugins.mkNeovimPlugin {
       }) buildGrammarDeps
     );
 
-    opts = mkIf cfg.folding {
+    opts = mkIf cfg.folding.enable {
       foldmethod = mkDefault "expr";
       foldexpr = mkDefault "v:lua.vim.treesitter.foldexpr()";
     };
diff --git a/tests/test-sources/plugins/by-name/treesitter/default.nix b/tests/test-sources/plugins/by-name/treesitter/default.nix
index 5f657869..632992d6 100644
--- a/tests/test-sources/plugins/by-name/treesitter/default.nix
+++ b/tests/test-sources/plugins/by-name/treesitter/default.nix
@@ -3,9 +3,9 @@
   default = {
     plugins.treesitter = {
       enable = true;
-      folding = true;
       highlight.enable = true;
       indent.enable = true;
+      folding.enable = true;
 
       settings = {
         install_dir.__raw = "vim.fs.joinpath(vim.fn.stdpath('data'), 'site')";