walkero
/
lite-xl
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases 14 Wiki Activity

Fix logic with project directories suggestions 

Attempt to fix issue #791.

The logic set with the previous commit for suggest_directory
is similar to the one we use except the previous expression
was false do to operator precedence for "and" versus "or".

With the modification here, when opening a project directory,
we suggest the recently used projects
if the text is equal to dirname(project_dir) + "/" which
happens to be the text the command view is initially set to.
In addition we do the same if text is "". If the condition is
not met we return the suggestions from common.dir_path_suggest to
match the text entered.

Works well on Linux but may not solve the problem on Windows, it
should be tested.
This commit is contained in:
Francesco Abbate 2022-01-05 23:21:47 +01:00
parent f3cf7ac9c7
commit 9929ca9c2d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
data/core/commands/core.lua
View File

@ -10,8 +10,9 @@ local restore_title_view = false
local function suggest_directory(text) local function suggest_directory(text)
text = common.home_expand(text) text = common.home_expand(text)
return common.home_encode_list((text == "" or text == common.home_expand(common.dirname(core.project_dir))) local basedir = common.dirname(core.project_dir)
and core.recent_projects or common.dir_path_suggest(text)) return common.home_encode_list((basedir and text == basedir .. PATHSEP or text == "") and
core.recent_projects or common.dir_path_suggest(text))
end end
command.add(nil, { command.add(nil, {
@ -149,7 +150,7 @@ command.add(nil, {
["core:change-project-folder"] = function() ["core:change-project-folder"] = function()
local dirname = common.dirname(core.project_dir) local dirname = common.dirname(core.project_dir)
if dirname then if dirname then
core.command_view:set_text(common.home_encode(dirname)) core.command_view:set_text(common.home_encode(dirname) .. PATHSEP)
end end
core.command_view:enter("Change Project Folder", function(text, item) core.command_view:enter("Change Project Folder", function(text, item)
text = system.absolute_path(common.home_expand(item and item.text or text)) text = system.absolute_path(common.home_expand(item and item.text or text))
@ -169,7 +170,7 @@ command.add(nil, {
["core:open-project-folder"] = function() ["core:open-project-folder"] = function()
local dirname = common.dirname(core.project_dir) local dirname = common.dirname(core.project_dir)
if dirname then if dirname then
core.command_view:set_text(common.home_encode(dirname)) core.command_view:set_text(common.home_encode(dirname) .. PATHSEP)
end end
core.command_view:enter("Open Project", function(text, item) core.command_view:enter("Open Project", function(text, item)
text = common.home_expand(item and item.text or text) text = common.home_expand(item and item.text or text)