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

Change prompt completion to only update when idle

Browse Source
This commit is contained in:
Maxime Coste 2017-04-03 18:11:09 +01:00
parent 055ed5ff7e
commit f31e898f13
1 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/input_handler.cc
View File

@ -679,11 +679,15 @@ public:
Completer completer, PromptCallback callback) Completer completer, PromptCallback callback)
: InputMode(input_handler), m_prompt(prompt.str()), m_prompt_face(face), : InputMode(input_handler), m_prompt(prompt.str()), m_prompt_face(face),
m_flags(flags), m_completer(std::move(completer)), m_callback(std::move(callback)), m_flags(flags), m_completer(std::move(completer)), m_callback(std::move(callback)),
m_autoshowcompl{context().options()["autoshowcompl"].get<bool>()} m_autoshowcompl{context().options()["autoshowcompl"].get<bool>()},
m_idle_timer{TimePoint::max(),
[this](Timer& timer) {
if (m_autoshowcompl and m_refresh_completion_pending)
refresh_completions(CompletionFlags::Fast);
context().hooks().run_hook("PromptIdle", "", context());
}}
{ {
m_history_it = ms_history[m_prompt].end(); m_history_it = ms_history[m_prompt].end();
if (m_autoshowcompl)
refresh_completions(CompletionFlags::Fast);
m_line_editor.reset(std::move(initstr)); m_line_editor.reset(std::move(initstr));
} }
@ -691,7 +695,6 @@ public:
{ {
History& history = ms_history[m_prompt]; History& history = ms_history[m_prompt];
const String& line = m_line_editor.line(); const String& line = m_line_editor.line();
bool showcompl = false;
if (key == Key::Return) if (key == Key::Return)
{ {
@ -775,7 +778,7 @@ public:
} while (it != history.begin()); } while (it != history.begin());
clear_completions(); clear_completions();
showcompl = true; m_refresh_completion_pending = true;
} }
} }
else if (key == Key::Down or key == ctrl('n')) // next else if (key == Key::Down or key == ctrl('n')) // next
@ -794,7 +797,7 @@ public:
m_line_editor.reset(m_prefix); m_line_editor.reset(m_prefix);
clear_completions(); clear_completions();
showcompl = true; m_refresh_completion_pending = true;
} }
} }
else if (key == Key::Tab or key == Key::BackTab) // tab completion else if (key == Key::Tab or key == Key::BackTab) // tab completion
@ -832,26 +835,26 @@ public:
{ {
m_current_completion = -1; m_current_completion = -1;
candidates.clear(); candidates.clear();
showcompl = true; m_refresh_completion_pending = true;
} }
} }
else if (key == ctrl('o')) else if (key == ctrl('o'))
{ {
m_autoshowcompl = false; m_autoshowcompl = false;
clear_completions(); clear_completions();
if (context().has_client())
context().client().menu_hide();
} }
else else
{ {
m_line_editor.handle_key(key); m_line_editor.handle_key(key);
clear_completions(); clear_completions();
showcompl = true; m_refresh_completion_pending = true;
} }
if (showcompl and m_autoshowcompl)
refresh_completions(CompletionFlags::Fast);
display(); display();
m_callback(line, PromptEvent::Change, context()); m_callback(line, PromptEvent::Change, context());
m_idle_timer.set_next_date(Clock::now() + get_idle_timeout(context()));
} }
void set_prompt_face(Face face) void set_prompt_face(Face face)
@ -875,14 +878,18 @@ private:
{ {
try try
{ {
m_refresh_completion_pending = false;
if (not m_completer) if (not m_completer)
return; return;
m_current_completion = -1; m_current_completion = -1;
const String& line = m_line_editor.line(); const String& line = m_line_editor.line();
m_completions = m_completer(context(), flags, line, m_completions = m_completer(context(), flags, line,
line.byte_count_to(m_line_editor.cursor_pos())); line.byte_count_to(m_line_editor.cursor_pos()));
if (context().has_client() and not m_completions.candidates.empty()) if (context().has_client())
{ {
if (m_completions.candidates.empty())
return context().client().menu_hide();
Vector<DisplayLine> items; Vector<DisplayLine> items;
for (auto& candidate : m_completions.candidates) for (auto& candidate : m_completions.candidates)
items.push_back({ candidate, {} }); items.push_back({ candidate, {} });
@ -904,8 +911,6 @@ private:
{ {
m_current_completion = -1; m_current_completion = -1;
m_completions.candidates.clear(); m_completions.candidates.clear();
if (context().has_client())
context().client().menu_hide();
} }
void display() void display()
@ -925,9 +930,16 @@ private:
{ {
display(); display();
m_callback(m_line_editor.line(), PromptEvent::Change, context()); m_callback(m_line_editor.line(), PromptEvent::Change, context());
m_idle_timer.set_next_date(Clock::now() + get_idle_timeout(context()));
} }
void on_disabled() override { context().print_status({}); } void on_disabled() override
{
context().print_status({});
m_idle_timer.set_next_date(TimePoint::max());
if (context().has_client())
context().client().menu_hide();
}
PromptCallback m_callback; PromptCallback m_callback;
Completer m_completer; Completer m_completer;
@ -938,8 +950,10 @@ private:
bool m_prefix_in_completions = false; bool m_prefix_in_completions = false;
String m_prefix; String m_prefix;
LineEditor m_line_editor; LineEditor m_line_editor;
bool m_autoshowcompl;
PromptFlags m_flags; PromptFlags m_flags;
bool m_autoshowcompl;
bool m_refresh_completion_pending = true;
Timer m_idle_timer;
using History = Vector<String, MemoryDomain::History>; using History = Vector<String, MemoryDomain::History>;
static HashMap<String, History, MemoryDomain::History> ms_history; static HashMap<String, History, MemoryDomain::History> ms_history;