From e43f1b9df9644791cdd3c7649810b556855c1f66 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 17 May 2021 03:29:51 -0400 Subject: [PATCH] Unified open and saving style. (#189) --- data/core/commands/core.lua | 3 ++- data/core/commands/doc.lua | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/data/core/commands/core.lua b/data/core/commands/core.lua index c8233062..abbe7cb4 100644 --- a/data/core/commands/core.lua +++ b/data/core/commands/core.lua @@ -88,7 +88,8 @@ command.add(nil, { ["core:open-file"] = function() local view = core.active_view if view.doc and view.doc.abs_filename then - core.command_view:set_text(common.home_encode(view.doc.abs_filename)) + local dirname, filename = view.doc.abs_filename:match("(.*)[/\\](.+)$") + core.command_view:set_text(core.normalize_to_project_dir(dirname) .. PATHSEP) end core.command_view:enter("Open File", function(text) core.root_view:open_doc(core.open_doc(common.home_expand(text))) diff --git a/data/core/commands/doc.lua b/data/core/commands/doc.lua index 965f3451..ee930150 100644 --- a/data/core/commands/doc.lua +++ b/data/core/commands/doc.lua @@ -299,6 +299,9 @@ local commands = { ["doc:save-as"] = function() if doc().filename then core.command_view:set_text(doc().filename) + elseif core.last_active_view then + local dirname, filename = core.last_active_view.doc.abs_filename:match("(.*)[/\\](.+)$") + core.command_view:set_text(core.normalize_to_project_dir(dirname) .. PATHSEP) end core.command_view:enter("Save As", function(filename) save(common.home_expand(filename))