fix offset package.loaded is cool

2 files changed, 16 insertions, 10 deletions

diff --git a/lua/lv-nvimtree/init.lua b/lua/lv-nvimtree/init.lua
index b07ff69a..4a2317e3 100644
--- a/lua/lv-nvimtree/init.lua
+++ b/lua/lv-nvimtree/init.lua
@@ -50,10 +50,10 @@ M.config = function()
     }
     local tree_cb = require'nvim-tree.config'.nvim_tree_callback
 
-  vim.g.nvim_tree_bindings = {
-      { key = {"l", "<CR>", "o"}, cb = tree_cb("edit")},
-      { key = "h", cb = tree_cb("close_node")},
-      { key = "v", cb = tree_cb("vsplit")}
+    vim.g.nvim_tree_bindings = {
+        {key = {"l", "<CR>", "o"}, cb = tree_cb("edit")},
+        {key = "h", cb = tree_cb("close_node")},
+        {key = "v", cb = tree_cb("vsplit")}
     }
 end
 
@@ -62,9 +62,13 @@ local view = require 'nvim-tree.view'
 M.toggle_tree = function()
     if view.win_open() then
         require'nvim-tree'.close()
-        require'bufferline.state'.set_offset(0)
+        if package.loaded['bufferline.state'] then
+            require'bufferline.state'.set_offset(0)
+        end
     else
-        require'bufferline.state'.set_offset(31, 'File Explorer')
+        if package.loaded['bufferline.state'] then
+            require'bufferline.state'.set_offset(31, 'File Explorer')
+        end
         require'nvim-tree'.find_file(true)
     end
 
diff --git a/lua/lv-which-key/init.lua b/lua/lv-which-key/init.lua
index 8d81e2e6..6afd61c6 100644
--- a/lua/lv-which-key/init.lua
+++ b/lua/lv-which-key/init.lua
@@ -61,12 +61,12 @@ vim.api.nvim_set_keymap('n', '<Leader>h', ':let @/=""<CR>',
 -- explorer
 
 -- TODO this introduces some bugs unfortunately
--- vim.api.nvim_set_keymap('n', '<Leader>e',
---                         ":lua require'lv-nvimtree'.toggle_tree()<CR>",
---                         {noremap = true, silent = true})
 vim.api.nvim_set_keymap('n', '<Leader>e',
-                        ":NvimTreeToggle<CR>",
+                        ":lua require'lv-nvimtree'.toggle_tree()<CR>",
                         {noremap = true, silent = true})
+-- vim.api.nvim_set_keymap('n', '<Leader>e',
+--                         ":NvimTreeToggle<CR>",
+--                         {noremap = true, silent = true})
 
 -- telescope
 vim.api.nvim_set_keymap('n', '<Leader>f', ':Telescope find_files<CR>',
@@ -199,6 +199,8 @@ local mappings = {
         f = {"<cmd>lua vim.lsp.buf.formatting()<cr>", "Format"},
         h = {"<cmd>Lspsaga hover_doc<cr>", "Hover Doc"},
         i = {"<cmd>LspInfo<cr>", "Info"},
+        j = {"<cmd>Lspsaga diagnostic_jump_prev<cr>", "Prev Diagnostic"},
+        k = {"<cmd>Lspsaga diagnostic_jump_next<cr>", "Next Diagnostic"},
         l = {"<cmd>Lspsaga lsp_finder<cr>", "LSP Finder"},
         L = {"<cmd>Lspsaga show_line_diagnostics<cr>", "Line Diagnostics"},
         p = {"<cmd>Lspsaga preview_definition<cr>", "Preview Definition"},