Francesco Abbate
9929ca9c2d
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.
218 lines
7.0 KiB
Lua
218 lines
7.0 KiB
Lua
local core = require "core"
|
|
local common = require "core.common"
|
|
local command = require "core.command"
|
|
local keymap = require "core.keymap"
|
|
local LogView = require "core.logview"
|
|
|
|
|
|
local fullscreen = false
|
|
local restore_title_view = false
|
|
|
|
local function suggest_directory(text)
|
|
text = common.home_expand(text)
|
|
local basedir = common.dirname(core.project_dir)
|
|
return common.home_encode_list((basedir and text == basedir .. PATHSEP or text == "") and
|
|
core.recent_projects or common.dir_path_suggest(text))
|
|
end
|
|
|
|
command.add(nil, {
|
|
["core:quit"] = function()
|
|
core.quit()
|
|
end,
|
|
|
|
["core:restart"] = function()
|
|
core.restart()
|
|
end,
|
|
|
|
["core:force-quit"] = function()
|
|
core.quit(true)
|
|
end,
|
|
|
|
["core:toggle-fullscreen"] = function()
|
|
fullscreen = not fullscreen
|
|
if fullscreen then
|
|
restore_title_view = core.title_view.visible
|
|
end
|
|
system.set_window_mode(fullscreen and "fullscreen" or "normal")
|
|
core.show_title_bar(not fullscreen and restore_title_view)
|
|
core.title_view:configure_hit_test(not fullscreen and restore_title_view)
|
|
end,
|
|
|
|
["core:reload-module"] = function()
|
|
core.command_view:enter("Reload Module", function(text, item)
|
|
local text = item and item.text or text
|
|
core.reload_module(text)
|
|
core.log("Reloaded module %q", text)
|
|
end, function(text)
|
|
local items = {}
|
|
for name in pairs(package.loaded) do
|
|
table.insert(items, name)
|
|
end
|
|
return common.fuzzy_match(items, text)
|
|
end)
|
|
end,
|
|
|
|
["core:find-command"] = function()
|
|
local commands = command.get_all_valid()
|
|
core.command_view:enter("Do Command", function(text, item)
|
|
if item then
|
|
command.perform(item.command)
|
|
end
|
|
end, function(text)
|
|
local res = common.fuzzy_match(commands, text)
|
|
for i, name in ipairs(res) do
|
|
res[i] = {
|
|
text = command.prettify_name(name),
|
|
info = keymap.get_binding(name),
|
|
command = name,
|
|
}
|
|
end
|
|
return res
|
|
end)
|
|
end,
|
|
|
|
["core:find-file"] = function()
|
|
if not core.project_files_number() then
|
|
return command.perform "core:open-file"
|
|
end
|
|
local files = {}
|
|
for dir, item in core.get_project_files() do
|
|
if item.type == "file" then
|
|
local path = (dir == core.project_dir and "" or dir .. PATHSEP)
|
|
table.insert(files, common.home_encode(path .. item.filename))
|
|
end
|
|
end
|
|
core.command_view:enter("Open File From Project", function(text, item)
|
|
text = item and item.text or text
|
|
core.root_view:open_doc(core.open_doc(common.home_expand(text)))
|
|
end, function(text)
|
|
return common.fuzzy_match_with_recents(files, core.visited_files, text)
|
|
end)
|
|
end,
|
|
|
|
["core:new-doc"] = function()
|
|
core.root_view:open_doc(core.open_doc())
|
|
end,
|
|
|
|
["core:open-file"] = function()
|
|
local view = core.active_view
|
|
if view.doc and view.doc.abs_filename then
|
|
local dirname, filename = view.doc.abs_filename:match("(.*)[/\\](.+)$")
|
|
if dirname then
|
|
dirname = core.normalize_to_project_dir(dirname)
|
|
local text = dirname == core.project_dir and "" or common.home_encode(dirname) .. PATHSEP
|
|
core.command_view:set_text(text)
|
|
end
|
|
end
|
|
core.command_view:enter("Open File", function(text)
|
|
local filename = system.absolute_path(common.home_expand(text))
|
|
core.root_view:open_doc(core.open_doc(filename))
|
|
end, function (text)
|
|
return common.home_encode_list(common.path_suggest(common.home_expand(text)))
|
|
end, nil, function(text)
|
|
local filename = common.home_expand(text)
|
|
local path_stat, err = system.get_file_info(filename)
|
|
if err then
|
|
if err:find("No such file", 1, true) then
|
|
-- check if the containing directory exists
|
|
local dirname = common.dirname(filename)
|
|
local dir_stat = dirname and system.get_file_info(dirname)
|
|
if not dirname or (dir_stat and dir_stat.type == 'dir') then
|
|
return true
|
|
end
|
|
end
|
|
core.error("Cannot open file %s: %s", text, err)
|
|
elseif path_stat.type == 'dir' then
|
|
core.error("Cannot open %s, is a folder", text)
|
|
else
|
|
return true
|
|
end
|
|
end)
|
|
end,
|
|
|
|
["core:open-log"] = function()
|
|
local node = core.root_view:get_active_node()
|
|
node:add_view(LogView())
|
|
end,
|
|
|
|
["core:open-user-module"] = function()
|
|
local user_module_doc = core.open_doc(USERDIR .. "/init.lua")
|
|
if not user_module_doc then return end
|
|
core.root_view:open_doc(user_module_doc)
|
|
end,
|
|
|
|
["core:open-project-module"] = function()
|
|
local doc = core.open_doc(".lite_project.lua")
|
|
core.root_view:open_doc(doc)
|
|
doc:save()
|
|
end,
|
|
|
|
["core:change-project-folder"] = function()
|
|
local dirname = common.dirname(core.project_dir)
|
|
if dirname then
|
|
core.command_view:set_text(common.home_encode(dirname) .. PATHSEP)
|
|
end
|
|
core.command_view:enter("Change Project Folder", function(text, item)
|
|
text = system.absolute_path(common.home_expand(item and item.text or text))
|
|
if text == core.project_dir then return end
|
|
local path_stat = system.get_file_info(text)
|
|
if not path_stat or path_stat.type ~= 'dir' then
|
|
core.error("Cannot open folder %q", text)
|
|
return
|
|
end
|
|
core.confirm_close_docs(core.docs, function(dirpath)
|
|
core.close_current_project()
|
|
core.open_folder_project(dirpath)
|
|
end, text)
|
|
end, suggest_directory)
|
|
end,
|
|
|
|
["core:open-project-folder"] = function()
|
|
local dirname = common.dirname(core.project_dir)
|
|
if dirname then
|
|
core.command_view:set_text(common.home_encode(dirname) .. PATHSEP)
|
|
end
|
|
core.command_view:enter("Open Project", function(text, item)
|
|
text = common.home_expand(item and item.text or text)
|
|
local path_stat = system.get_file_info(text)
|
|
if not path_stat or path_stat.type ~= 'dir' then
|
|
core.error("Cannot open folder %q", text)
|
|
return
|
|
end
|
|
system.exec(string.format("%q %q", EXEFILE, text))
|
|
end, suggest_directory)
|
|
end,
|
|
|
|
["core:add-directory"] = function()
|
|
core.command_view:enter("Add Directory", function(text)
|
|
text = common.home_expand(text)
|
|
local path_stat, err = system.get_file_info(text)
|
|
if not path_stat then
|
|
core.error("cannot open %q: %s", text, err)
|
|
return
|
|
elseif path_stat.type ~= 'dir' then
|
|
core.error("%q is not a directory", text)
|
|
return
|
|
end
|
|
core.add_project_directory(system.absolute_path(text))
|
|
end, suggest_directory)
|
|
end,
|
|
|
|
["core:remove-directory"] = function()
|
|
local dir_list = {}
|
|
local n = #core.project_directories
|
|
for i = n, 2, -1 do
|
|
dir_list[n - i + 1] = core.project_directories[i].name
|
|
end
|
|
core.command_view:enter("Remove Directory", function(text, item)
|
|
text = common.home_expand(item and item.text or text)
|
|
if not core.remove_project_directory(text) then
|
|
core.error("No directory %q to be removed", text)
|
|
end
|
|
end, function(text)
|
|
text = common.home_expand(text)
|
|
return common.home_encode_list(common.dir_list_suggest(text, dir_list))
|
|
end)
|
|
end,
|
|
})
|