From ef4c02ab0ef647c5ca842199267da7541e5f65e3 Mon Sep 17 00:00:00 2001 From: Guldoman Date: Sun, 28 Nov 2021 07:16:53 +0100 Subject: [PATCH 1/2] Check the entire path in `TreeView` predicate --- data/plugins/treeview.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/plugins/treeview.lua b/data/plugins/treeview.lua index 2e66083a..a5604722 100644 --- a/data/plugins/treeview.lua +++ b/data/plugins/treeview.lua @@ -406,7 +406,7 @@ function RootView:draw(...) end local function is_project_folder(path) - return common.basename(core.project_dir) == path + return core.project_dir == path end menu:register(function() return view.hovered_item end, { @@ -417,7 +417,7 @@ menu:register(function() return view.hovered_item end, { menu:register( function() return view.hovered_item - and not is_project_folder(view.hovered_item.filename) + and not is_project_folder(view.hovered_item.abs_filename) end, { { text = "Rename", command = "treeview:rename" }, From d7afcb08b1a03ca2823070aaa12322d736d5b58d Mon Sep 17 00:00:00 2001 From: Guldoman Date: Tue, 30 Nov 2021 01:11:35 +0100 Subject: [PATCH 2/2] Check the entire path in `TreeView` `new-file` and `new-folder` commands --- data/plugins/treeview.lua | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/data/plugins/treeview.lua b/data/plugins/treeview.lua index a5604722..4f5db701 100644 --- a/data/plugins/treeview.lua +++ b/data/plugins/treeview.lua @@ -467,9 +467,8 @@ command.add(function() return view.hovered_item ~= nil end, { end, ["treeview:new-file"] = function() - local dir_name = view.hovered_item.filename - if not is_project_folder(dir_name) then - core.command_view:set_text(dir_name .. "/") + if not is_project_folder(view.hovered_item.abs_filename) then + core.command_view:set_text(view.hovered_item.filename .. "/") end core.command_view:enter("Filename", function(filename) local doc_filename = core.project_dir .. PATHSEP .. filename @@ -482,9 +481,8 @@ command.add(function() return view.hovered_item ~= nil end, { end, ["treeview:new-folder"] = function() - local dir_name = view.hovered_item.filename - if not is_project_folder(dir_name) then - core.command_view:set_text(dir_name .. "/") + if not is_project_folder(view.hovered_item.abs_filename) then + core.command_view:set_text(view.hovered_item.filename .. "/") end core.command_view:enter("Folder Name", function(filename) local dir_path = core.project_dir .. PATHSEP .. filename