fix: open_files_do_not_replace_types also looks at buftype, which makes terminal work (#805)

Author: cseickel

README.md

@@ -123,7 +123,7 @@ use {
         popup_border_style = "rounded",
         enable_git_status = true,
         enable_diagnostics = true,
-        open_files_do_not_replace_filetypes = { "terminal", "trouble", "qf" }, -- when opening files, do not use windows containing these filetypes
+        open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, -- when opening files, do not use windows containing these filetypes or buftypes
         sort_case_insensitive = false, -- used when sorting files and directories in the tree
         sort_function = nil , -- use a custom function for sorting files and directories in the tree 
         -- sort_function = function (a,b)

lua/neo-tree.lua

@@ -178,7 +178,8 @@ M.get_prior_window = function(ignore_filetypes)
       if success and is_valid then
         local buf = vim.api.nvim_win_get_buf(last_win)
         local ft = vim.api.nvim_buf_get_option(buf, "filetype")
-        if ignore[ft] ~= true then
+        local bt = vim.api.nvim_buf_get_option(buf, "buftype") or "normal"
+        if ignore[ft] ~= true and ignore[bt] ~= true then
           return last_win
         end
       end

lua/neo-tree/defaults.lua

@@ -34,7 +34,7 @@ local config = {
   log_level = "info", -- "trace", "debug", "info", "warn", "error", "fatal"
   log_to_file = false, -- true, false, "/path/to/file.log", use :NeoTreeLogs to show the file
   open_files_in_last_window = true, -- false = open files in top left window
-  open_files_do_not_replace_filetypes = { "terminal", "trouble", "qf" }, -- when opening files, do not use windows containing these filetypes
+  open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, -- when opening files, do not use windows containing these filetypes or buftypes
   popup_border_style = "NC", -- "double", "none", "rounded", "shadow", "single" or "solid"
   resize_timer_interval = 500, -- in ms, needed for containers to redraw right aligned and faded content
                                -- set to -1 to disable the resize timer entirely

lua/neo-tree/setup/deprecations.lua

@@ -70,6 +70,7 @@ M.migrate = function(config)
   moved("filesystem.filters", "filesystem.filtered_items")
   moved("filesystem.filters.show_hidden", "filesystem.filtered_items.hide_dotfiles", opposite)
   moved("filesystem.filters.respect_gitignore", "filesystem.filtered_items.hide_gitignored")
+  moved("open_files_do_not_replace_filetypes", "open_files_do_not_replace_types")
   removed("filesystem.filters.gitignore_source")
   removed("filesystem.filter_items.gitignore_source")
   renamed_value("filesystem.hijack_netrw_behavior", "open_split", "open_current")

lua/neo-tree/utils.lua

@@ -461,7 +461,7 @@ M.get_appropriate_window = function(state)
   -- use last window if possible
   local suitable_window_found = false
   local nt = require("neo-tree")
-  local ignore_ft = nt.config.open_files_do_not_replace_filetypes
+  local ignore_ft = nt.config.open_files_do_not_replace_types
   local ignore = M.list_to_dict(ignore_ft)
   ignore["neo-tree"] = true
   if nt.config.open_files_in_last_window then
@@ -483,7 +483,8 @@ M.get_appropriate_window = function(state)
   end
   local attempts = 0
   while attempts < 5 and not suitable_window_found do
-    if ignore[vim.bo.filetype] or M.is_floating() then
+    local bt = vim.bo.buftype or "normal"
+    if ignore[vim.bo.filetype] or ignore[bt] or M.is_floating() then
       attempts = attempts + 1
       vim.cmd("wincmd w")
     else