xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for various completions in :prompt

Browse Source 
Fixes #489
This commit is contained in:
Maxime Coste 2015-11-23 13:57:36 +00:00
parent 36bf145b02
commit ad5c8db7a8
1 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/commands.cc
View File

@ -1354,22 +1354,54 @@ const CommandDesc prompt_cmd = {
"prompt <prompt> <register> <command>: prompt the use to enter a text string " "prompt <prompt> <register> <command>: prompt the use to enter a text string "
"stores it in <register> and then executes <command>", "stores it in <register> and then executes <command>",
ParameterDesc{ ParameterDesc{
{ { "init", { true, "set initial prompt content" } } }, { { "init", { true, "set initial prompt content" } },
{ "file-completion", { false, "use file completion for prompt" } },
{ "client-completion", { false, "use client completion for prompt" } },
{ "buffer-completion", { false, "use buffer completion for prompt" } },
{ "command-completion", { false, "use command completion for prompt" } } },
ParameterDesc::Flags::None, 3, 3 ParameterDesc::Flags::None, 3, 3
}, },
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
CommandCompleter{}, CommandCompleter{},
[](const ParametersParser& params, Context& context, const ShellContext& shell_context) [](const ParametersParser& parser, Context& context, const ShellContext& shell_context)
{ {
if (params[1].length() != 1) if (parser[1].length() != 1)
throw runtime_error("register name should be a single character"); throw runtime_error("register name should be a single character");
const char reg = params[1][0_byte]; const char reg = parser[1][0_byte];
const String& command = params[2]; const String& command = parser[2];
auto initstr = params.get_switch("init").value_or(StringView{}); auto initstr = parser.get_switch("init").value_or(StringView{});
Completer completer;
if (parser.get_switch("file-completion"))
completer = [](const Context& context, CompletionFlags,
StringView prefix, ByteCount cursor_pos) -> Completions {
auto& ignored_files = context.options()["ignored_files"].get<Regex>();
return { 0_byte, cursor_pos,
complete_filename(prefix, ignored_files, cursor_pos) };
};
else if (parser.get_switch("client-completion"))
completer = [](const Context& context, CompletionFlags,
StringView prefix, ByteCount cursor_pos) -> Completions {
return { 0_byte, cursor_pos,
ClientManager::instance().complete_client_name(prefix, cursor_pos) };
};
else if (parser.get_switch("buffer-completion"))
completer = [](const Context& context, CompletionFlags,
StringView prefix, ByteCount cursor_pos) -> Completions {
return { 0_byte, cursor_pos,
complete_buffer_name(prefix, cursor_pos) };
};
else if (parser.get_switch("command-completion"))
completer = [](const Context& context, CompletionFlags flags,
StringView prefix, ByteCount cursor_pos) -> Completions {
return CommandManager::instance().complete(
context, flags, prefix, cursor_pos);
};
context.input_handler().prompt( context.input_handler().prompt(
params[0], initstr.str(), get_face("Prompt"), Completer{}, parser[0], initstr.str(), get_face("Prompt"), std::move(completer),
[=](StringView str, PromptEvent event, Context& context) [=](StringView str, PromptEvent event, Context& context)
{ {
if (event != PromptEvent::Validate) if (event != PromptEvent::Validate)