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

Disable auto-insertion of menu completion when no text was entered

Browse Source 
This avoids a frustrating behaviour where Kakoune autoinserts the first
command name when hitting <space> after a ; in a command line. It also
fixes the empty prompt case that was auto-completed instead of executing
the default command.
This commit is contained in:
Maxime Coste 2020-10-20 21:05:49 +11:00
parent 4d22b405d6
commit 354cfd3b8f
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/input_handler.cc
View File

@ -771,11 +771,16 @@ public:
{ {
const String& line = m_line_editor.line(); const String& line = m_line_editor.line();
auto can_auto_insert_completion = [&] {
const bool has_completions = not m_completions.candidates.empty();
const bool completion_selected = m_current_completion != -1;
const bool text_entered = m_completions.start != line.byte_count_to(m_line_editor.cursor_pos());
return has_completions and not completion_selected and text_entered;
};
if (key == Key::Return) if (key == Key::Return)
{ {
if ((m_completions.flags & Completions::Flags::Menu) and if ((m_completions.flags & Completions::Flags::Menu) and can_auto_insert_completion())
m_current_completion == -1 and
not m_completions.candidates.empty())
{ {
const String& completion = m_completions.candidates.front(); const String& completion = m_completions.candidates.front();
m_line_editor.insert_from(line.char_count_to(m_completions.start), m_line_editor.insert_from(line.char_count_to(m_completions.start),
@ -976,7 +981,7 @@ public:
{ {
try try
{ {
m_line_editor.reset(expand(m_line_editor.line(), context()), m_empty_text); m_line_editor.reset(expand(line, context()), m_empty_text);
} }
catch (std::runtime_error& error) catch (std::runtime_error& error)
{ {
@ -993,12 +998,10 @@ public:
{ {
if (key == ' ' and if (key == ' ' and
(m_completions.flags & Completions::Flags::Menu) and (m_completions.flags & Completions::Flags::Menu) and
not (m_completions.flags & Completions::Flags::Quoted) and not (m_completions.flags & Completions::Flags::Quoted) and // if token is quoted, this space does not end it
m_current_completion == -1 and not m_completions.candidates.empty()) can_auto_insert_completion())
{
m_line_editor.insert_from(line.char_count_to(m_completions.start), m_line_editor.insert_from(line.char_count_to(m_completions.start),
m_completions.candidates.front()); m_completions.candidates.front());
}
m_line_editor.handle_key(key); m_line_editor.handle_key(key);
clear_completions(); clear_completions();