fix: :DiffviewClose when the view is the last tab page (fixes #501)

sindrets · May 23, 2024 · d758a00 · d758a00
1 parent 72c6983
commit d758a00
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/lua/diffview/scene/view.lua b/lua/diffview/scene/view.lua
@@ -76,6 +76,10 @@ function View:close()
   if self.tabpage and api.nvim_tabpage_is_valid(self.tabpage) then
     DiffviewGlobal.emitter:emit("view_leave", self)
 
+    if #api.nvim_list_tabpages() == 1 then
+      vim.cmd("tabnew")
+    end
+
     local pagenr = api.nvim_tabpage_get_number(self.tabpage)
     vim.cmd("tabclose " .. pagenr)
   end

diff --git a/lua/diffview/scene/views/standard/standard_view.lua b/lua/diffview/scene/views/standard/standard_view.lua
@@ -44,17 +44,8 @@ end
 
 ---@override
 function StandardView:close()
-  self.closing:send()
   self.panel:destroy()
-
-  if self.tabpage and api.nvim_tabpage_is_valid(self.tabpage) then
-    DiffviewGlobal.emitter:emit("view_leave", self)
-
-    local pagenr = api.nvim_tabpage_get_number(self.tabpage)
-    vim.cmd("tabclose " .. pagenr)
-  end
-
-  DiffviewGlobal.emitter:emit("view_closed", self)
+  View.close(self)
 end
 
 ---@override