Do not take directories into account when completing buffer name

(except if a / is found in the completion prefix)
This commit is contained in:
Maxime Coste 2013-09-25 18:59:03 +01:00
parent 60f4e1104f
commit b080f456a7

View File

@ -99,14 +99,23 @@ CandidateList BufferManager::complete_buffername(const String& prefix,
ByteCount cursor_pos)
{
String real_prefix = prefix.substr(0, cursor_pos);
const bool include_dirs = contains(real_prefix, '/');
CandidateList result;
CandidateList subsequence_result;
for (auto& buffer : m_buffers)
{
String name = buffer->display_name();
if (prefix_match(name, real_prefix))
String match_name = name;
if (not include_dirs and buffer->flags() & Buffer::Flags::File)
{
ByteCount pos = name.find_last_of('/');
if (pos != String::npos)
match_name = name.substr(pos);
}
if (prefix_match(match_name, real_prefix))
result.push_back(escape(name));
if (subsequence_match(name, real_prefix))
if (subsequence_match(match_name, real_prefix))
subsequence_result.push_back(escape(name));
}
return result.empty() ? subsequence_result : result;