Cleaned up propogation.

lite-xl · adamharrison · Apr 7, 2024 · Apr 7, 2024 · Apr 7, 2024 · Apr 7, 2024
commit 5fa713c542f1ed41ae081e9238a4d4f79b882aaa
diff --git a/data/core/commands/root.lua b/data/core/commands/root.lua
@@ -7,30 +7,15 @@ local config = require "core.config"
 local Node = require "core.node"
 
 
-local function close_docviews(keep_active)
-  local root = core.root_view.root_node
-  root:propogate(function(node)
-    local i = 1
-    while i <= #node.views do
-      local view = node.views[i]
-      if view.context == "session" and (not keep_active or view ~= node.active_view) then
-        node:close_view(root, view)
-      else
-        i = i + 1
-      end
-    end
-  end)
-end
-
 local t = {
   ["root:close-all"] = function()
-    core.confirm_close_docs(core.docs, close_docviews)
+    core.confirm_close_docs(core.docs, core.root_view.close_session_views, core.root_view)
   end,
 
   ["root:close-all-others"] = function()
     local active_doc, docs = core.active_view and core.active_view.doc, {}
     for i, v in ipairs(core.docs) do if v ~= active_doc then table.insert(docs, v) end end
-    core.confirm_close_docs(docs, close_docviews, true)
+    core.confirm_close_docs(docs, core.close_session_views, core.root_view, true)
   end,
 
   ["root:move-tab-left"] = function(node)

diff --git a/data/core/init.lua b/data/core/init.lua
@@ -88,7 +88,7 @@ end
 
 function core.open_folder_project(dir_path_abs)
   if core.set_project_dir(dir_path_abs, core.on_quit_project) then
-    core.root_view:close_all_docviews()
+    core.root_view:close_session_views()
     reload_customizations()
     update_recents_project("add", dir_path_abs)
     core.add_project_directory(dir_path_abs)

diff --git a/data/core/node.lua b/data/core/node.lua
@@ -28,13 +28,24 @@ end
 
 
 function Node:propogate(fn, ...)
-  if self.type ~= "leaf" then
-    self.a:propogate(fn, ...)
-    self.b:propogate(fn, ...)
-  end
+  if self.type ~= "leaf" then self.a:propogate(fn, ...) end
+  if self.type ~= "leaf" then self.b:propogate(fn, ...) end
   fn(self, ...)
 end
 
+function Node:view_propogate(fn, ...)
+  self:propogate(function(node)
+    local i = 1
+    while i <= #node.views do
+      local view = node.views[i]
+      fn(node, view)
+      if view == node.views[i] then
+        i = i + 1
+      end
+    end
+  end)
+end
+
 
 ---@deprecated
 function Node:on_mouse_moved(x, y, ...)

diff --git a/data/core/rootview.lua b/data/core/rootview.lua
@@ -550,4 +550,13 @@ function RootView:add_view(view, pocket, layout)
 end
 
 
+function RootView:close_session_views(keep_active)
+  self.root_node:view_propogate(function(node, view)
+    if view.context == "session" and (not keep_active or view ~= node.active_view) then
+      node:close_view(self.root_node, view)
+    end
+  end)
+end
+
+
 return RootView