From 518a775f17c38a07db3a6addeccbafa9ab670636 Mon Sep 17 00:00:00 2001
From: Cameron Ring <cameron@cs.stanford.edu>
Date: Mon, 24 Jun 2024 16:46:57 -0700
Subject: [PATCH 1/2] Fix tried to close last window error

Easiest repro is only have a new buffer (not saved to a file) and exit.
We'll  try to close that window and generate an error.

To fix, we wrap `Lib.close_unsupported_windows` in a `pcall`. In
general, not great to eat all errors but we're making our best effort to
close all of the unsupported windows and there are a bunch of edge cases
there so this seems like the most reasonable path to me.

Also added a missiing local
---
 lua/auto-session/init.lua | 7 ++++---
 lua/auto-session/lib.lua  | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lua/auto-session/init.lua b/lua/auto-session/init.lua
index 12a0cdd..055a857 100644
--- a/lua/auto-session/init.lua
+++ b/lua/auto-session/init.lua
@@ -379,7 +379,7 @@ end
 -- This is useful for starter plugins which don't want to display 'restore session'
 -- unless a session for the current working directory exists.
 function AutoSession.session_exists_for_cwd()
-  session_file = get_session_file_name(vim.fn.getcwd())
+  local session_file = get_session_file_name(vim.fn.getcwd())
   return Lib.is_readable(session_file)
 end
 
@@ -396,7 +396,8 @@ function AutoSession.AutoSaveSession(sessions_dir)
     end
 
     if AutoSession.conf.close_unsupported_windows then
-      Lib.close_unsupported_windows()
+      -- Swallow errors as we may end up trying to close the last window
+      pcall(Lib.close_unsupported_windows)
     end
 
     AutoSession.SaveSession(sessions_dir, true)
@@ -907,7 +908,7 @@ function SetupAutocmds()
   vim.api.nvim_create_user_command(
     "SessionSave",
     SaveSession,
-    { bang = true, nargs = '?', desc = "Save the current session. Based in cwd if no arguments are passed" }
+    { bang = true, nargs = "?", desc = "Save the current session. Based in cwd if no arguments are passed" }
   )
 
   vim.api.nvim_create_user_command("SessionRestore", SessionRestore, { bang = true, desc = "Restore Session" })
diff --git a/lua/auto-session/lib.lua b/lua/auto-session/lib.lua
index 53a392b..c8bb8c2 100644
--- a/lua/auto-session/lib.lua
+++ b/lua/auto-session/lib.lua
@@ -194,7 +194,7 @@ function Lib.close_unsupported_windows()
       local file_name = vim.api.nvim_buf_get_name(buffer)
       if not Lib.is_readable(file_name) then
         vim.api.nvim_win_close(window, true)
-        break;
+        break
       end
     end
   end

From ada257537f567028df38baeb3d896248a5585808 Mon Sep 17 00:00:00 2001
From: Cameron Ring <cameron@cs.stanford.edu>
Date: Wed, 26 Jun 2024 09:07:48 -0700
Subject: [PATCH 2/2] Never try to close the last window in the last tab.

If we do close a window in a tab, keep checking other windows in that
tab (that's why the `break` was removed).

Log an error (debug level) if `close_unsupported_windows` fails. Only
useful for debugging (not worth bothering the user about it)
---
 lua/auto-session/init.lua | 11 +++++++----
 lua/auto-session/lib.lua  |  5 ++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lua/auto-session/init.lua b/lua/auto-session/init.lua
index 055a857..0c299d1 100644
--- a/lua/auto-session/init.lua
+++ b/lua/auto-session/init.lua
@@ -101,7 +101,7 @@ local luaOnlyConf = {
       control_filename = "session_control.json", -- File name of the session control file
     },
   },
-  silent_restore = true
+  silent_restore = true,
 }
 
 -- Set default config on plugin load
@@ -396,8 +396,11 @@ function AutoSession.AutoSaveSession(sessions_dir)
     end
 
     if AutoSession.conf.close_unsupported_windows then
-      -- Swallow errors as we may end up trying to close the last window
-      pcall(Lib.close_unsupported_windows)
+      -- Wrap in pcall in case there's an error while trying to close windows
+      local success, result = pcall(Lib.close_unsupported_windows)
+      if not success then
+        Lib.logger.debug("Error closing unsupported windows: " .. result)
+      end
     end
 
     AutoSession.SaveSession(sessions_dir, true)
@@ -857,7 +860,7 @@ function AutoSession.PurgeOrphanedSessions()
   local orphaned_sessions = {}
 
   for _, session in ipairs(AutoSession.get_session_files()) do
-    if session.display_name:find('^/.*') and vim.fn.isdirectory(session.display_name) == Lib._VIM_FALSE then
+    if session.display_name:find "^/.*" and vim.fn.isdirectory(session.display_name) == Lib._VIM_FALSE then
       table.insert(orphaned_sessions, session.display_name)
     end
   end
diff --git a/lua/auto-session/lib.lua b/lua/auto-session/lib.lua
index c8bb8c2..c2d7c2c 100644
--- a/lua/auto-session/lib.lua
+++ b/lua/auto-session/lib.lua
@@ -190,11 +190,14 @@ function Lib.close_unsupported_windows()
   for _, tabpage in ipairs(tabpages) do
     local windows = vim.api.nvim_tabpage_list_wins(tabpage)
     for _, window in ipairs(windows) do
+      -- Never try to close the last window of the last tab
+      if vim.fn.tabpagenr "$" == 1 and vim.fn.winnr "$" == 1 then
+        return
+      end
       local buffer = vim.api.nvim_win_get_buf(window)
       local file_name = vim.api.nvim_buf_get_name(buffer)
       if not Lib.is_readable(file_name) then
         vim.api.nvim_win_close(window, true)
-        break
       end
     end
   end