fix(mappings): move diagnostic mappings to always loaded

AstroNvim · Apr 1, 2024 · e575551 · e575551
1 parent 6d4fcf8
commit e575551
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/lua/astronvim/plugins/_astrocore_mappings.lua b/lua/astronvim/plugins/_astrocore_mappings.lua
@@ -8,7 +8,7 @@ return {
     opts._map_section = {
       f = { desc = get_icon("Search", 1, true) .. "Find" },
       p = { desc = get_icon("Package", 1, true) .. "Packages" },
-      l = { desc = get_icon("ActiveLSP", 1, true) .. "LSP" },
+      l = { desc = get_icon("ActiveLSP", 1, true) .. "Language Tools" },
       u = { desc = get_icon("Window", 1, true) .. "UI/UX" },
       b = { desc = get_icon("Tab", 1, true) .. "Buffers" },
       bs = { desc = get_icon("Sort", 1, true) .. "Sort Buffers" },
@@ -84,6 +84,12 @@ return {
     maps.n["<Leader>bsi"] = { function() require("astrocore.buffer").sort "bufnr" end, desc = "By buffer number" }
     maps.n["<Leader>bsm"] = { function() require("astrocore.buffer").sort "modified" end, desc = "By modification" }
 
+    maps.n["<Leader>l"] = sections.l
+    maps.n["<Leader>ld"] = { function() vim.diagnostic.open_float() end, desc = "Hover diagnostics" }
+    maps.n["[d"] = { function() vim.diagnostic.goto_prev() end, desc = "Previous diagnostic" }
+    maps.n["]d"] = { function() vim.diagnostic.goto_next() end, desc = "Next diagnostic" }
+    maps.n["gl"] = { function() vim.diagnostic.open_float() end, desc = "Hover diagnostics" }
+
     -- Navigate tabs
     maps.n["]t"] = { function() vim.cmd.tabnext() end, desc = "Next tab" }
     maps.n["[t"] = { function() vim.cmd.tabprevious() end, desc = "Previous tab" }

diff --git a/lua/astronvim/plugins/_astrolsp_mappings.lua b/lua/astronvim/plugins/_astrolsp_mappings.lua
@@ -3,12 +3,7 @@ return {
   ---@param opts AstroLSPOpts
   opts = function(_, opts)
     local maps = require("astrocore").empty_map_table()
-    maps.v["<Leader>l"] = { desc = " LSP" }
-
-    maps.n["<Leader>ld"] = { function() vim.diagnostic.open_float() end, desc = "Hover diagnostics" }
-    maps.n["[d"] = { function() vim.diagnostic.goto_prev() end, desc = "Previous diagnostic" }
-    maps.n["]d"] = { function() vim.diagnostic.goto_next() end, desc = "Next diagnostic" }
-    maps.n["gl"] = { function() vim.diagnostic.open_float() end, desc = "Hover diagnostics" }
+    maps.v["<Leader>l"] = { desc = require("astroui").get_icon("ActiveLSP", 1, true) .. "Language Tools" }
 
     maps.n["<Leader>la"] = {
       function() vim.lsp.buf.code_action() end,

diff --git a/lua/astronvim/plugins/lsp.lua b/lua/astronvim/plugins/lsp.lua
@@ -60,7 +60,6 @@ return {
         "AstroNvim/astrocore",
         opts = function(_, opts)
           local maps = opts.mappings
-          maps.n["<Leader>l"] = opts._map_section.l
           maps.n["<Leader>lS"] = { function() require("aerial").toggle() end, desc = "Symbols outline" }
         end,
       },

diff --git a/lua/astronvim/plugins/telescope.lua b/lua/astronvim/plugins/telescope.lua
@@ -68,7 +68,6 @@ return {
           end,
           desc = "Find words in all files",
         }
-        maps.n["<Leader>l"] = opts._map_section.l
         maps.n["<Leader>ls"] = {
           function()
             if is_available "aerial.nvim" then