♻ Move bufdelete to separate module

Nguyen-Hoang-Nam · Jul 9, 2022 · d4a86d5 · d4a86d5
1 parent c830e4c
commit d4a86d5
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 28 deletions.
diff --git a/lua/mappings.lua b/lua/mappings.lua
@@ -30,7 +30,7 @@ map("v", "<S-Tab>", "<gV", options)
 
 map("n", "<Leader>q", [[<Cmd>let @/=""<CR>]], cmd_options)
 map("n", "<Leader>s", [[:silent write<CR>]], cmd_options)
-map("n", "<Leader>w", "", cmd_option(utils_core.bufdelete))
+map("n", "<Leader>w", "", cmd_option(require("utils.bufdelete").bufdelete))
 
 map("n", "<Leader>m", "", cmd_option(format.format))
 map("n", "<Leader>c", "", cmd_option(format.range_format))

diff --git a/lua/utils/bufdelete.lua b/lua/utils/bufdelete.lua
@@ -0,0 +1,37 @@
+local bo = vim.bo
+local cmd = vim.cmd
+local api = vim.api
+
+local M = {}
+
+function M.bufdelete()
+    if bo.modified then
+        cmd("write")
+    end
+
+    local bufnr = api.nvim_get_current_buf()
+
+    -- TODO: Get list of valid buffers
+    local buffers = vim.tbl_filter(function(buf)
+        return bo[buf].buflisted and api.nvim_buf_is_valid(buf)
+    end, api.nvim_list_bufs())
+
+    if #buffers == 1 then
+        -- TODO: Hide scrollview before close buffer
+        cmd("silent! ScrollViewDisable | bd " .. bufnr .. " | silent! ScrollViewEnable")
+
+        -- TODO: Show Dashboard when closing the last buffer
+        require("dashboard").instance(true)
+    else
+        if bufnr ~= buffers[#buffers] then
+            cmd("bnext")
+        else
+            cmd("bprevious")
+        end
+
+        -- TODO: Hide scrollview before close buffer
+        cmd("silent! ScrollViewDisable | bd " .. bufnr .. " | silent! ScrollViewEnable")
+    end
+end
+
+return M
diff --git a/lua/utils/core.lua b/lua/utils/core.lua
@@ -1,37 +1,10 @@
-local bo = vim.bo
 local cmd = vim.cmd
 local api = vim.api
 
 local M = {
     is_rest = false,
 }
 
-function M.bufdelete()
-    if bo.modified then
-        cmd("write")
-    end
-
-    local bufnr = api.nvim_get_current_buf()
-
-    local buffers = vim.tbl_filter(function(buf)
-        return bo[buf].buflisted and api.nvim_buf_is_valid(buf)
-    end, api.nvim_list_bufs())
-
-    if #buffers == 1 then
-        cmd("silent! ScrollViewDisable | bd " .. bufnr .. " | silent! ScrollViewEnable")
-
-        require("dashboard").instance(true)
-    else
-        if bufnr ~= buffers[#buffers] then
-            cmd("bnext")
-        else
-            cmd("bprevious")
-        end
-
-        cmd("silent! ScrollViewDisable | bd " .. bufnr .. " | silent! ScrollViewEnable")
-    end
-end
-
 -- Count number of properties in table
 -- Because of lua only count consecutive properties
 -- @param T Table