mawww/kakoune
1
1
Fork 0
mirror of https://github.com/mawww/kakoune.git synced 2024-12-25 12:36:11 +03:00
Code Issues Projects Releases Wiki Activity

Support absolute paths when completing commands

Browse Source
This commit is contained in:
Maxime Coste 2014-12-21 17:08:33 +00:00
parent 5b94b73152
commit 7a7ad57871
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/file.cc
View File

@ -339,8 +339,6 @@ std::vector<String> complete_filename(StringView prefix,
std::vector<String> complete_command(StringView prefix, ByteCount cursor_pos) std::vector<String> complete_command(StringView prefix, ByteCount cursor_pos)
{ {
String real_prefix = parse_filename(prefix.substr(0, cursor_pos)); String real_prefix = parse_filename(prefix.substr(0, cursor_pos));
String dirname;
String fileprefix = real_prefix;
ByteCount dir_end = -1; ByteCount dir_end = -1;
for (ByteCount i = 0; i < real_prefix.length(); ++i) for (ByteCount i = 0; i < real_prefix.length(); ++i)
@ -349,6 +347,27 @@ std::vector<String> complete_command(StringView prefix, ByteCount cursor_pos)
dir_end = i; dir_end = i;
} }
if (dir_end != -1)
{
auto dirname = real_prefix.substr(0, dir_end + 1);
auto fileprefix = real_prefix.substr(dir_end + 1);
auto filter = [&](const dirent& entry)
{
struct stat st;
if (stat((dirname + entry.d_name).c_str(), &st))
return false;
bool executable = (st.st_mode & S_IXUSR)
| (st.st_mode & S_IXGRP)
| (st.st_mode & S_IXOTH);
return S_ISDIR(st.st_mode) or (S_ISREG(st.st_mode) and executable);
};
std::vector<String> res = list_files(fileprefix, dirname, filter);
for (auto& file : res)
file = dirname + file;
std::sort(res.begin(), res.end());
return res;
}
typedef decltype(stat::st_mtime) TimeSpec; typedef decltype(stat::st_mtime) TimeSpec;
struct CommandCache struct CommandCache
@ -358,17 +377,8 @@ std::vector<String> complete_command(StringView prefix, ByteCount cursor_pos)
}; };
static UnorderedMap<String, CommandCache> command_cache; static UnorderedMap<String, CommandCache> command_cache;
std::vector<StringView> path;
if (dir_end != -1)
{
path.emplace_back(real_prefix.substr(0, dir_end + 1));
fileprefix = real_prefix.substr(dir_end + 1);
}
else
path = split(getenv("PATH"), ':');
std::vector<String> res; std::vector<String> res;
for (auto dir : path) for (auto dir : split(getenv("PATH"), ':'))
{ {
String dirname = dir; String dirname = dir;
if (not dirname.empty() and dirname.back() != '/') if (not dirname.empty() and dirname.back() != '/')
@ -396,7 +406,7 @@ std::vector<String> complete_command(StringView prefix, ByteCount cursor_pos)
} }
for (auto& cmd : cache.commands) for (auto& cmd : cache.commands)
{ {
if (prefix_match(cmd, fileprefix)) if (prefix_match(cmd, real_prefix))
res.push_back(cmd); res.push_back(cmd);
} }
} }