Address Popup errors when switching tabs

lua/libmodal/src/collections/Popup.lua

@@ -4,6 +4,7 @@
 	 */
 --]]
 
+local vim = vim
 local api = vim.api
 
 --[[
@@ -12,9 +13,9 @@ local api = vim.api
 	 */
 --]]
 
-local Popup = {
-	['TYPE'] = 'libmodal-popup',
-	['config'] = {
+local Popup = require('libmodal/src/classes').new(
+	'libmodal-popup',
+	{['config'] = {
 		['anchor']    = 'SW',
 		['col']       = api.nvim_get_option('columns') - 1,
 		['focusable'] = false,
@@ -24,9 +25,25 @@ local Popup = {
 		                - api.nvim_get_option('cmdheight')
 		                - 1,
 		['style']     = 'minimal',
-		['width']     = 25
-	}
-}
+		['width']     = 1
+	}}
+)
+
+----------------------------
+--[[ SUMMARY:
+	* Check if `window` is non-`nil` and is valid.
+]]
+--[[ PARAMS:
+	* `window` => the window number.
+]]
+--[[ RETURNS:
+	* `true` => `window` is non-`nil` and is valid
+	* `false` => otherwise
+]]
+----------------------------
+local function valid(window)
+	return window and api.nvim_win_is_valid(window)
+end
 
 --[[
 	/*
@@ -36,35 +53,61 @@ local Popup = {
 
 local _metaPopup = require('libmodal/src/classes').new(Popup.TYPE)
 
----------------------------
+--------------------------------------
 --[[ SUMMARY:
 	* Close `self.window`
 	* The `self` is inert after calling this.
 ]]
----------------------------
-function _metaPopup:close()
-	api.nvim_win_close(self.window, false)
+--[[ PARAMS:
+	* `keep_buffer` => whether or not to keep `self.buffer`.
+]]
+--------------------------------------
+function _metaPopup:close(keep_buffer)
+	if valid(self.window) then
+		api.nvim_win_close(self.window, false)
+		self.window = nil
+	end
+
+	if not keep_buffer then
+		self.buffer = nil
+		self._inputChars = nil
+	end
+end
+
+--------------------------
+--[[ SUMMARY:
+	* Open the popup.
+	* If the popup was already open, close it and re-open it.
+]]
+--------------------------
+function _metaPopup:open()
+	local config = Popup.config
+
+	if valid(self.window) then
+		config = vim.tbl_extend('force', config, api.nvim_win_get_config(self.window))
+		self:close(true)
+	end
 
-	self.buffer     = nil
-	self._inputChars = nil
-	self.window      = nil
+	self.window = api.nvim_open_win(self.buffer, false, config)
 end
 
 ---------------------------------------
 --[[ SUMMARY:
 	* Update `buffer` with the latest user `inputBytes`.
 ]]
+--[[ PARAMS:
+	* `inputBytes` => the charaters to fill the popup with.
+]]
 ---------------------------------------
 function _metaPopup:refresh(inputBytes)
 	local inputBytesLen = #inputBytes
-	local inputChars    = self._inputChars
 
 	-- The user simply typed one more character onto the last one.
-	if inputBytesLen == #inputChars + 1 then
-		inputChars[inputBytesLen] = string.char(inputBytes[inputBytesLen])
-	elseif inputBytesLen == 1 then
-		inputChars = {string.char(inputBytes[1])}
-	else -- other tries to optimize this procedure fellthrough, so do it the hard way.
+	if inputBytesLen == #self._inputChars + 1 then
+		self._inputChars[inputBytesLen] = string.char(inputBytes[inputBytesLen])
+	elseif inputBytesLen == 1 then -- the user's typing was reset by a parser.
+		self._inputChars = {string.char(inputBytes[1])}
+	else -- other tries to optimize this procedure fell through, so do it the hard way.
 		local chars = {}
 		for i, byte in ipairs(inputBytes) do
 			chars[i] = string.char(byte)
@@ -72,10 +115,15 @@ function _metaPopup:refresh(inputBytes)
 		self._inputChars = chars
 	end
 
-	api.nvim_buf_set_lines(
-		self.buffer, 0, 1, true,
-		{table.concat(self._inputChars)}
-	)
+	api.nvim_buf_set_lines(self.buffer, 0, 1, true, {
+		table.concat(self._inputChars)
+	})
+
+	if not valid(self.window) or api.nvim_win_get_tabpage(self.window) ~= api.nvim_get_current_tabpage() then
+		self:open()
+	end
+
+	api.nvim_win_set_width(self.window, #self._inputChars)
 end
 
 --[[
@@ -84,19 +132,28 @@ end
 	 */
 --]]
 
+--------------------
+--[[ SUMMARY:
+	* Create a new popup window.
+]]
+--[[ RETURNS:
+	* A new popup window.
+]]
+--------------------
 function Popup.new()
 	local buf = api.nvim_create_buf(false, true)
 
-	return setmetatable(
+	local self = setmetatable(
 		{
-			['buffer']     = buf,
+			['buffer'] = buf,
 			['_inputChars'] = {},
-			['window']      = api.nvim_call_function(
-				'nvim_open_win', {buf, false, Popup.config}
-			)
 		},
 		_metaPopup
 	)
+
+	self:open()
+
+	return self
 end
 
 --[[

lua/libmodal/src/utils/api.lua

@@ -124,7 +124,6 @@ end
 	* `msg` => the message of the error.
 ]]
 --------------------------------------
--- local returnHighlightSegment = HighlightSegment.new('Question', '\nPress any key to return.')
 function api.nvim_show_err(title, msg)
 	local HighlightSegment = require('libmodal/src/Indicator/HighlightSegment')
 	api.nvim_lecho({