feat(ui): more intuitive buffer switching logic

Author: mrcjkb

lua/fff/picker_ui.lua

@@ -2083,6 +2083,19 @@ function M.recall_query_from_history()
   end)
 end
 
+local suitable_buftypes = {
+  [''] = true,
+  terminal = true,
+  acwrite = true,
+}
+
+--- Check if a buffer type is suitable
+--- @param buftype string
+--- @return boolean | nil
+local function is_suitable_buftype(buftype)
+  return suitable_buftypes[buftype]
+end
+
 --- Find the first visible window with a normal file buffer
 --- @return number|nil Window ID of the first suitable window, or nil if none found
 local function find_suitable_window()
@@ -2094,7 +2107,6 @@ local function find_suitable_window()
       local buf = vim.api.nvim_win_get_buf(win)
       if vim.api.nvim_buf_is_valid(buf) then
         local buftype = vim.api.nvim_get_option_value('buftype', { buf = buf })
-        local modifiable = vim.api.nvim_get_option_value('modifiable', { buf = buf })
         local filetype = vim.api.nvim_get_option_value('filetype', { buf = buf })
 
         local is_picker_window = (
@@ -2105,8 +2117,7 @@ local function find_suitable_window()
         )
 
         if
-          (buftype == '' or buftype == 'acwrite')
-          and modifiable
+          is_suitable_buftype(buftype)
           and not is_picker_window
           and filetype ~= 'undotree'
         then
@@ -2299,10 +2310,8 @@ function M.select(action)
   if action == 'edit' then
     local current_buf = vim.api.nvim_get_current_buf()
     local current_buftype = vim.api.nvim_get_option_value('buftype', { buf = current_buf })
-    local current_buf_modifiable = vim.api.nvim_get_option_value('modifiable', { buf = current_buf })
-
-    -- If current active buffer is not a normal buffer we find a suitable window with a tab otherwise opening a new split
-    if current_buftype ~= '' or not current_buf_modifiable then
+    -- If current active buffer is not a suitable buffer we find a suitable window with a tab otherwise opening a new split
+    if not is_suitable_buftype(current_buftype) then
       local suitable_win = find_suitable_window()
       if suitable_win then vim.api.nvim_set_current_win(suitable_win) end
     end