From 7484be88c7a6806403a2fd28c2a4cf88f5a890ff Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 10 Sep 2024 18:10:09 -0500
Subject: [PATCH 1/2] plugins/rest-nvim: revert by-name migration

Not sure yet why, but this plugin being here breaks treesitter and
neotest.
---
 plugins/default.nix                                             | 2 ++
 plugins/{by-name/rest/default.nix => utils/rest.nix}            | 0
 .../plugins/{by-name/rest/default.nix => utils/rest.nix}        | 0
 3 files changed, 2 insertions(+)
 rename plugins/{by-name/rest/default.nix => utils/rest.nix} (100%)
 rename tests/test-sources/plugins/{by-name/rest/default.nix => utils/rest.nix} (100%)

diff --git a/plugins/default.nix b/plugins/default.nix
index c19c59dbe4..e1103bc2ad 100644
--- a/plugins/default.nix
+++ b/plugins/default.nix
@@ -32,6 +32,8 @@
     ./pluginmanagers/lazy.nix
     ./pluginmanagers/lz-n.nix
 
+    ./utils/rest.nix
+
     ./deprecation.nix
   ];
 }
diff --git a/plugins/by-name/rest/default.nix b/plugins/utils/rest.nix
similarity index 100%
rename from plugins/by-name/rest/default.nix
rename to plugins/utils/rest.nix
diff --git a/tests/test-sources/plugins/by-name/rest/default.nix b/tests/test-sources/plugins/utils/rest.nix
similarity index 100%
rename from tests/test-sources/plugins/by-name/rest/default.nix
rename to tests/test-sources/plugins/utils/rest.nix

From 11c133e89e4090c43445a2c3b5af2322831d7219 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 10 Sep 2024 23:00:57 -0500
Subject: [PATCH 2/2] plugins/rest-nvim: add telescope integration

---
 plugins/utils/rest.nix                    | 11 +++++++++++
 tests/test-sources/plugins/utils/rest.nix | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/plugins/utils/rest.nix b/plugins/utils/rest.nix
index 26f481975e..24595da5ea 100644
--- a/plugins/utils/rest.nix
+++ b/plugins/utils/rest.nix
@@ -415,6 +415,8 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
         Sets up the filetype association of `.http` files to trigger treesitter support to enable `rest` functionality.
       '';
     };
+
+    enableTelescope = lib.mkEnableOption "telescope integration";
   };
 
   extraConfig = cfg: {
@@ -425,8 +427,17 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
           Nixvim (plugins.rest): Requires the `http` parser from `plugins.treesitter`, please set `plugins.treesitter.enable`.
         '';
       }
+      {
+        assertion = cfg.enableTelescope -> config.plugins.telescope.enable;
+        message = ''
+          Nixvim (plugins.rest): You have `plugins.rest.enableTelescope` set to true, but `plugins.telescope.enable` is false.
+          Either disable the telescope integration or enable telescope.
+        '';
+      }
     ];
 
+    extraConfigLua = lib.mkIf cfg.enableTelescope ''require("telescope").load_extension("rest")'';
+
     extraPackages = [ cfg.curlPackage ];
 
     filetype = lib.mkIf cfg.enableHttpFiletypeAssociation {
diff --git a/tests/test-sources/plugins/utils/rest.nix b/tests/test-sources/plugins/utils/rest.nix
index c04acadbea..2e16bf6bb6 100644
--- a/tests/test-sources/plugins/utils/rest.nix
+++ b/tests/test-sources/plugins/utils/rest.nix
@@ -100,4 +100,15 @@
       };
     };
   };
+
+  telescope = {
+    plugins = {
+      rest = {
+        enable = true;
+        enableTelescope = true;
+      };
+      treesitter.enable = true;
+      telescope.enable = true;
+    };
+  };
 }