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

Prompt: use entered text as prefix for history search

Browse Source
This commit is contained in:
Maxime Coste 2012-09-04 13:48:04 +02:00
parent 11d5ae2743
commit 63f467081a
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/client.cc
View File

@ -152,24 +152,41 @@ public:
m_client.reset_normal_mode(); m_client.reset_normal_mode();
return; return;
} }
else if (key == Key(Key::Modifiers::Control, 'p') or else if (key == Key(Key::Modifiers::Control, 'p') or // previous
key == Key(Key::Modifiers::Control, 'c')) key == Key(Key::Modifiers::Control, 'c'))
{ {
if (m_history_it != history.begin()) if (m_history_it != history.begin())
{ {
if (m_history_it == history.end()) if (m_history_it == history.end())
m_saved_result = m_result; m_saved_result = m_result;
--m_history_it; auto it = m_history_it;
// search for the previous history entry matching typed prefix
CharCount prefix_length = m_saved_result.length();
do
{
--it;
if (it->substr(0, prefix_length) == m_saved_result)
{
m_history_it = it;
break;
}
} while (it != history.begin());
m_result = *m_history_it; m_result = *m_history_it;
m_cursor_pos = m_result.length(); m_cursor_pos = m_result.length();
} }
} }
else if (key == Key(Key::Modifiers::Control, 'n') or else if (key == Key(Key::Modifiers::Control, 'n') or // next
key == Key(Key::Modifiers::Control, 'b')) key == Key(Key::Modifiers::Control, 'b'))
{ {
if (m_history_it != history.end()) if (m_history_it != history.end())
{ {
CharCount prefix_length = m_saved_result.length();
// search for the next history entry matching typed prefix
++m_history_it; ++m_history_it;
while (m_history_it != history.end() and
m_history_it->substr(0, prefix_length) != m_saved_result)
++m_history_it;
if (m_history_it != history.end()) if (m_history_it != history.end())
m_result = *m_history_it; m_result = *m_history_it;
else else