コミット: 898c2c216c59de25a0507cbb29f7f2e7ddd20ad4 - nvim (git)

コミットメタ情報

• リビジョン: 898c2c216c59de25a0507cbb29f7f2e7ddd20ad4 (tree)
• 日時: 2022-12-15 16:49:23
• 作者: badcoff33 <none@none>
• コミッター: badcoff33

ログメッセージ

nvim_win_is_valid makes it more robust

変更サマリ

• modified: lua/utils/popups.lua

差分

--- a/lua/utils/popups.lua
+++ b/lua/utils/popups.lua
@@ -1,23 +1,30 @@
 -- To actually reload the module, we need to remove it from the cache first:
---package.loaded["utils.popups"] = nil
+package.loaded["utils.popups"] = nil
 
 local num_window = 0
-local delayed_close_time = 2000
+local delayed_close_time = 3000
 
 function Popup_One_Liner()
     local self = {
         bufnr = nil,
         winnr = nil,
+        winoffset = 0,
     }
 
     local open = function(text, duration)
-
         if duration == 0 then
             return
         end
 
         self.bufnr = vim.api.nvim_create_buf(false, true)
-        vim.api.nvim_buf_set_lines(self.bufnr, 0, -1, true, {" " .. text .. " "})
+        vim.api.nvim_buf_set_lines(
+            self.bufnr,
+            0,
+            -1,
+            true,
+            { " " .. text .. " " }
+        )
+        self.winoffset = num_window
         self.winnr = vim.api.nvim_open_win(self.bufnr, false, {
             relative = "editor",
             anchor = "se",
@@ -50,20 +57,27 @@ function Popup_One_Liner()
     end
 
     local update = function(text)
-        if self.winnr == nil then
-            return
+        if vim.api.nvim_win_is_valid(self.winnr) == true then
+            vim.api.nvim_win_set_config(self.winnr, {
+                relative = "editor",
+                col = vim.o.columns,
+                row = vim.o.lines - 2 - self.winoffset,
+                width = #text + 2,
+                height = 1,
+            })
+            vim.api.nvim_buf_set_lines(
+                self.bufnr,
+                0,
+                -1,
+                true,
+                { " " .. text .. " " }
+            )
         end
-
-        vim.api.nvim_win_set_config(self.winnr, {
-            width = #text + 2,
-            height = 1,
-        })
-        vim.api.nvim_buf_set_lines(self.bufnr, 0, -1, true, {" " .. text .. " "})
     end
 
     local close = function()
         vim.fn.timer_start(delayed_close_time, function()
-            if self.winnr ~= nil then
+            if vim.api.nvim_win_is_valid(self.winnr) == true then
                 vim.api.nvim_win_close(self.winnr, true)
                 num_window = num_window - 1
                 self.winnr = nil