From a4377b22ac28606a1a1e8786cffd8e7efd198eee Mon Sep 17 00:00:00 2001
From: "Kenneth Benzie (Benie)" <benie@infektor.net>
Date: Fri, 12 Apr 2024 18:15:24 +0100
Subject: [PATCH] Split diagnostics config out of completions config

---
 lua/plugins/completions.lua | 20 --------------------
 lua/plugins/diagnostics.lua | 27 +++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 20 deletions(-)
 create mode 100644 lua/plugins/diagnostics.lua

diff --git a/lua/plugins/completions.lua b/lua/plugins/completions.lua
index 636fa47..379df03 100644
--- a/lua/plugins/completions.lua
+++ b/lua/plugins/completions.lua
@@ -19,7 +19,6 @@ return {
     -- LSP UI plugins
     'aznhe21/actions-preview.nvim',
     'j-hui/fidget.nvim',
-    'folke/trouble.nvim',
     'nvim-tree/nvim-web-devicons',
     'ray-x/lsp_signature.nvim',
 
@@ -146,21 +145,6 @@ return {
       }
     )
 
-    -- Customise diagnostics UI
-    vim.diagnostic.config({
-      float = {
-        border = 'rounded', -- Enable rounded border on floats
-      },
-      virtual_text = false, -- Disable trailing virtual text
-    })
-
-    -- Diagnostics mappings
-    -- TODO: trouble.nvim mappings instead? https://youtu.be/MuUrCcvE-Yw?t=631
-    vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { remap = false })
-    vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { remap = false })
-    vim.keymap.set('n', '<leader>sd', vim.diagnostic.open_float, { remap = false })
-    vim.keymap.set('n', '<leader>sq', vim.diagnostic.setqflist, { remap = false })
-
     -- Mappings created when LSP is attached to a buffer
     local augroup = vim.api.nvim_create_augroup('lsp', { clear = true })
     vim.api.nvim_create_autocmd('LspAttach', {
@@ -217,10 +201,6 @@ return {
 
     -- LSP UI plugins
     require('fidget').setup({})
-    require('trouble').setup({})
-    vim.keymap.set('n', '<leader>tr', function()
-      require('trouble').toggle()
-    end, { remap = false })
     require('lsp_signature').setup({
       floating_window = true,
       hint_enable = false,
diff --git a/lua/plugins/diagnostics.lua b/lua/plugins/diagnostics.lua
new file mode 100644
index 0000000..aed0714
--- /dev/null
+++ b/lua/plugins/diagnostics.lua
@@ -0,0 +1,27 @@
+return {
+  {
+    'folke/trouble.nvim',
+    dependencies = {
+      'nvim-tree/nvim-web-devicons'
+    },
+    config = function()
+      require('trouble').setup({})
+
+      vim.keymap.set('n', '<leader>tr', function()
+        require('trouble').toggle()
+      end, { remap = false })
+
+      vim.diagnostic.config({
+        float = {
+          border = 'rounded', -- Enable rounded border on floats
+        },
+        virtual_text = false, -- Disable trailing virtual text
+      })
+
+      vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { remap = false })
+      vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { remap = false })
+      vim.keymap.set('n', '<leader>sd', vim.diagnostic.open_float, { remap = false })
+      vim.keymap.set('n', '<leader>sq', vim.diagnostic.setqflist, { remap = false })
+    end
+  },
+}