Merge remote-tracking branch 'lenormf/complete-expansion-file'

This commit is contained in:
Maxime Coste 2019-11-26 21:34:22 +11:00
commit 9716c7c82d

View File

@ -9,6 +9,7 @@
#include "optional.hh" #include "optional.hh"
#include "option_types.hh" #include "option_types.hh"
#include "ranges.hh" #include "ranges.hh"
#include "regex.hh"
#include "register_manager.hh" #include "register_manager.hh"
#include "shell_manager.hh" #include "shell_manager.hh"
#include "utils.hh" #include "utils.hh"
@ -689,6 +690,13 @@ Completions CommandManager::complete(const Context& context,
ShellManager::instance().complete_env_var( ShellManager::instance().complete_env_var(
token.content, cursor_pos_in_token) }; token.content, cursor_pos_in_token) };
case Token::Type::FileExpand:
{
const auto& ignored_files = context.options()["ignored_files"].get<Regex>();
return {start , cursor_pos, complete_filename(
token.content, ignored_files, cursor_pos_in_token, FilenameFlags::Expand) };
}
case Token::Type::Raw: case Token::Type::Raw:
case Token::Type::RawQuoted: case Token::Type::RawQuoted:
case Token::Type::RawEval: case Token::Type::RawEval: