intermediate commit

Author: tjdevries

lua/popup/border.lua

@@ -1,5 +1,3 @@
-package.loaded['popup.border'] = nil
-
 local utils = require('popup.utils')
 
 local Border = {}
@@ -80,7 +78,7 @@ function Border._create_lines(content_win_options, border_win_options)
   return border_lines
 end
 
-function Border:new(content_buf_id, content_win_id, content_win_options, border_win_options)
+function Border:new(content_bufnr, content_win_id, content_win_options, border_win_options)
   assert(type(content_win_id) == 'number', "Must supply a valid win_id. It's possible you forgot to call with ':'")
 
   border_win_options = utils.apply_defaults(border_win_options, {
@@ -104,15 +102,15 @@ function Border:new(content_buf_id, content_win_id, content_win_options, border_
   obj._border_win_options = border_win_options
 
 
-  obj.buf_id = vim.api.nvim_create_buf(false, true)
-  assert(obj.buf_id, "Failed to create border buffer")
+  obj.bufnr = vim.api.nvim_create_buf(false, true)
+  assert(obj.bufnr, "Failed to create border buffer")
 
   obj.contents = Border._create_lines(content_win_options, border_win_options)
-  vim.api.nvim_buf_set_lines(obj.buf_id, 0, -1, false, obj.contents)
+  vim.api.nvim_buf_set_lines(obj.bufnr, 0, -1, false, obj.contents)
 
   local thickness = border_win_options.border_thickness
 
-  obj.win_id = vim.api.nvim_open_win(obj.buf_id, false, {
+  obj.win_id = vim.api.nvim_open_win(obj.bufnr, false, {
     anchor = content_win_options.anchor,
     relative = content_win_options.relative,
     style = "minimal",
@@ -122,15 +120,31 @@ function Border:new(content_buf_id, content_win_id, content_win_options, border_
     height = content_win_options.height + thickness.top + thickness.bot,
   })
 
-  local silent = true
-  vim.cmd(
-    string.format(
-      "autocmd WinLeave,BufLeave,BufDelete <buffer=%s> ++once ++nested %s call nvim_win_close(%s, v:true)",
-      content_buf_id,
-      (silent and "silent!") or "",
-      obj.win_id
-    )
-  )
+  -- local silent = true
+  -- vim.cmd(
+  --   string.format(
+  --     "autocmd WinLeave,BufLeave,BufDelete %s <buffer=%s> ++once ++nested :call popup#close_win(%s, v:true)",
+  --     (silent and "<silent>") or "",
+  --     content_bufnr,
+  --     obj.win_id
+  --   )
+  -- )
+  -- vim.cmd(string.format(
+  --   "autocmd WinClosed,BufLeave,BufDelete,WinLeave <silent> <buffer=%s> ++once ++nested :call popup#close_win(%s, v:true)",
+  --   content_bufnr,
+  --   obj.win_id
+  -- ))
+  vim.cmd(string.format(
+    "autocmd BufLeave,BufDelete <buffer=%s> ++nested ++once :call popup#close_related_win(%s, %s)",
+    content_bufnr,
+    content_win_id,
+    obj.win_id))
+
+  vim.cmd(string.format(
+    "autocmd WinClosed,WinLeave <buffer=%s> ++nested ++once :call popup#close_win(%s, v:true)",
+    content_bufnr,
+    obj.win_id))
+
 
   setmetatable(obj, Border)
 

lua/popup/init.lua

@@ -178,9 +178,11 @@ function popup.create(what, vim_options)
       -- TODO: Handle word, WORD, expr, and the range functions... which seem hard?
     end
   else
+    local silent = false
     vim.cmd(
       string.format(
-        "autocmd BufLeave,BufDelete <buffer=%s> ++once call nvim_win_close(%s, v:false)",
+        "autocmd BufLeave,BufDelete %s <buffer=%s> ++nested call popup#close_win(%s, v:true)",
+        (silent and "<silent>") or '',
         buf,
         win_id
       )
@@ -190,7 +192,7 @@ function popup.create(what, vim_options)
   if vim_options.time then
     local timer = vim.loop.new_timer()
     timer:start(vim_options.time, 0, vim.schedule_wrap(function()
-      vim.fn.nvim_win_close(win_id, false)
+      vim.fn['popup#close_win'](win_id, false)
     end))
   end
 
@@ -297,8 +299,9 @@ function popup.create(what, vim_options)
     border_options.title = vim_options.title
   end
 
+  local border = nil
   if should_show_border then
-    Border:new(buf, win_id, win_opts, border_options)
+    border = Border:new(buf, win_id, win_opts, border_options)
   end
 
   if vim_options.highlight then
@@ -309,7 +312,9 @@ function popup.create(what, vim_options)
   --    but actually has some extra metadata about it.
   --
   --    This would make `hidden` a lot easier to manage
-  return win_id
+  return win_id, {
+    border = border,
+  }
 end
 
 function popup.show(self, asdf)

plugin/popup.vim

@@ -1,3 +1,15 @@
 " Auto load the compat module, so that we don't have to write any weird code
 let s:lua_folder = fnamemodify(expand("<sfile>"), ":h:h") . "/lua"
 call execute(printf('luafile %s/popup/_compat.lua', s:lua_folder))
+
+function! popup#close_win(win_id, force) abort
+  try
+    call nvim_win_close(a:win_id, a:force)
+  catch
+  endtry
+endfunction
+
+function! popup#close_related_win(parent_win_id, child_win_id) abort
+  call popup#close_win(a:parent_win_id, v:true)
+  call popup#close_win(a:child_win_id, v:true)
+endfunction