From c7dded4bf9969a4111a66e748ed56cc9512ad536 Mon Sep 17 00:00:00 2001
From: Matt Leong <mattleong91@gmail.com>
Date: Mon, 13 Dec 2021 09:34:10 -0800
Subject: [PATCH] fix(plugins): update telescope mappings

---
 lua/cosmic/lsp/mappings.lua           | 11 ++++++++++-
 lua/cosmic/lsp/providers/null_ls.lua  |  3 +--
 lua/cosmic/plugins/telescope/init.lua |  4 ++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/lua/cosmic/lsp/mappings.lua b/lua/cosmic/lsp/mappings.lua
index b6daee1..f5efdcf 100644
--- a/lua/cosmic/lsp/mappings.lua
+++ b/lua/cosmic/lsp/mappings.lua
@@ -14,15 +14,24 @@ map('n', 'gn', '<cmd>lua require("cosmic-ui").rename()<cr>')
 map('n', '[g', '<cmd>lua vim.diagnostic.goto_prev()<cr>')
 map('n', ']g', '<cmd>lua vim.diagnostic.goto_next()<cr>')
 map('n', 'ge', '<cmd>lua vim.diagnostic.open_float(nil, { scope = "line", })<cr>')
-map('n', '<leader>ge', '<cmd>lua require("telescope.builtin").lsp_document_diagnostics()<cr>')
+map('n', '<leader>ge', '<cmd>Telescope diagnostics bufnr=0<cr>')
+
+-- hover
 map('n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>')
+
+-- code actions
 map('n', '<leader>ga', '<cmd>lua require("cosmic-ui").code_actions()<cr>')
 map('v', '<leader>ga', '<cmd>lua require("cosmic-ui").range_code_actions()<cr>')
+
+-- formatting
 map('n', '<leader>gf', '<cmd>lua vim.lsp.buf.formatting()<cr>')
 map('v', '<leader>gf', '<cmd>lua vim.lsp.buf.range_formatting()<cr>')
+
+-- signature help
 map('n', '<C-K>', '<cmd>lua require("lsp_signature").signature()<cr>')
 
 -- lsp workspace
+map('n', '<leader>wd', '<cmd>Telescope diagnostics<cr>')
 map('n', '<leader>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<cr>')
 map('n', '<leader>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<cr>')
 map(
diff --git a/lua/cosmic/lsp/providers/null_ls.lua b/lua/cosmic/lsp/providers/null_ls.lua
index 4232a52..8a28379 100644
--- a/lua/cosmic/lsp/providers/null_ls.lua
+++ b/lua/cosmic/lsp/providers/null_ls.lua
@@ -31,5 +31,4 @@ require('null-ls').setup(vim.tbl_deep_extend('force', {
     null_ls.builtins.formatting.stylua,
   },
 
-  root_dir = defaults.root_dir,
-}, config_opts or {}))
+}, defaults, config_opts or {}))
diff --git a/lua/cosmic/plugins/telescope/init.lua b/lua/cosmic/plugins/telescope/init.lua
index 6417717..295e294 100644
--- a/lua/cosmic/plugins/telescope/init.lua
+++ b/lua/cosmic/plugins/telescope/init.lua
@@ -105,6 +105,10 @@ require('telescope').setup(vim.tbl_deep_extend('force', {
       mappings = default_mappings,
       hidden = true,
     },
+    diagnostics = {
+      initial_mode = 'normal',
+      mappings = default_mappings,
+    },
     git_files = {
       prompt_title = '✨ Search Git Project ✨',
       mappings = default_mappings,