fix(lazy): suggested fixes for pref/lazyloading branch (#3754)

fix(lazy): Suggested fixes from previous comments

fix(lazy): applying suggestions from code review

Co-authored-by: LostNeophyte <[email protected]>

Co-authored-by: Pratyush Bharati <[email protected]>
Co-authored-by: LostNeophyte <[email protected]>

3 files changed, 15 insertions, 14 deletions

diff --git a/lua/lvim/core/which-key.lua b/lua/lvim/core/which-key.lua
index 4f52c49b..ea79f03b 100644
--- a/lua/lvim/core/which-key.lua
+++ b/lua/lvim/core/which-key.lua
@@ -205,20 +205,20 @@ M.config = function()
         a = { "<cmd>lua vim.lsp.buf.code_action()<cr>", "Code Action" },
         d = { "<cmd>Telescope diagnostics bufnr=0 theme=get_ivy<cr>", "Buffer Diagnostics" },
         w = { "<cmd>Telescope diagnostics<cr>", "Diagnostics" },
-        f = { "<cmd>lua require('lvim.lsp.utils').format()", "Format" },
+        f = { "<cmd>lua require('lvim.lsp.utils').format()<cr>", "Format" },
         i = { "<cmd>LspInfo<cr>", "Info" },
         I = { "<cmd>Mason<cr>", "Mason Info" },
         j = {
-          "<cmd>lua vim.diagnostic.goto_next()",
+          "<cmd>lua vim.diagnostic.goto_next()<cr>",
           "Next Diagnostic",
         },
         k = {
-          "<cmd>lua vim.diagnostic.goto_prev()",
+          "<cmd>lua vim.diagnostic.goto_prev()<cr>",
           "Prev Diagnostic",
         },
-        l = { "<cmd>lua vim.lsp.codelens.run()", "CodeLens Action" },
-        q = { "<cmd>lua vim.diagnostic.setloclist()", "Quickfix" },
-        r = { "<cmd>lua vim.lsp.buf.rename()", "Rename" },
+        l = { "<cmd>lua vim.lsp.codelens.run()<cr>", "CodeLens Action" },
+        q = { "<cmd>lua vim.diagnostic.setloclist()<cr>", "Quickfix" },
+        r = { "<cmd>lua vim.lsp.buf.rename()<cr>", "Rename" },
         s = { "<cmd>Telescope lsp_document_symbols<cr>", "Document Symbols" },
         S = {
           "<cmd>Telescope lsp_dynamic_workspace_symbols<cr>",
diff --git a/lua/lvim/lsp/config.lua b/lua/lvim/lsp/config.lua
index 8f33f626..f6abeeca 100644
--- a/lua/lvim/lsp/config.lua
+++ b/lua/lvim/lsp/config.lua
@@ -96,12 +96,12 @@ return {
   },
   buffer_mappings = {
     normal_mode = {
-      ["K"] = { "<cmd>lua vim.lsp.buf.hover()", "Show hover" },
-      ["gd"] = { "<cmd>lua vim.lsp.buf.definition()", "Goto Definition" },
-      ["gD"] = { "<cmd>lua vim.lsp.buf.declaration()", "Goto declaration" },
-      ["gr"] = { "<cmd>lua vim.lsp.buf.references()", "Goto references" },
-      ["gI"] = { "<cmd>lua vim.lsp.buf.implementation()", "Goto Implementation" },
-      ["gs"] = { "<cmd>lua vim.lsp.buf.signature_help()", "show signature help" },
+      ["K"] = { "<cmd>lua vim.lsp.buf.hover()<cr>", "Show hover" },
+      ["gd"] = { "<cmd>lua vim.lsp.buf.definition()<cr>", "Goto Definition" },
+      ["gD"] = { "<cmd>lua vim.lsp.buf.declaration()<cr>", "Goto declaration" },
+      ["gr"] = { "<cmd>lua vim.lsp.buf.references()<cr>", "Goto references" },
+      ["gI"] = { "<cmd>lua vim.lsp.buf.implementation()<cr>", "Goto Implementation" },
+      ["gs"] = { "<cmd>lua vim.lsp.buf.signature_help()<cr>", "show signature help" },
       ["gl"] = {
         function()
           local config = lvim.lsp.diagnostics.float
diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua
index 47d40971..904f42eb 100644
--- a/lua/lvim/plugins.lua
+++ b/lua/lvim/plugins.lua
@@ -131,7 +131,7 @@ local core_plugins = {
       require("lvim.core.nvimtree").setup()
     end,
     enabled = lvim.builtin.nvimtree.active,
-    cmd = { "NvimTreeToggle", "NvimTreeOpen", "NvimTreeFocus" },
+    cmd = { "NvimTreeToggle", "NvimTreeOpen", "NvimTreeFocus", "NvimTreeFindFileToggle" },
     event = "User DirOpened",
   },
   -- Lir
@@ -168,7 +168,8 @@ local core_plugins = {
     config = function()
       require("lvim.core.comment").setup()
     end,
-    keys = { { "gc", mode = { "n", "v" } }, { "gb", mode = { "n", "v" } } },
+    keys = { { "gc", mode = { "n", "v" } }, { "gb", mode = { "n", "v" } }},
+    event = "User FileOpened",
     enabled = lvim.builtin.comment.active,
   },