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

Extract complete_buffer_name as a free function in commands.cc

Browse Source
This commit is contained in:
Maxime Coste 2014-12-23 17:42:17 +00:00
parent ae602106e0
commit ed54e102ee
3 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/buffer_manager.cc
View File

@ -115,24 +115,6 @@ void BufferManager::backup_modified_buffers()
}
}
CandidateList BufferManager::complete_buffer_name(StringView prefix,
ByteCount cursor_pos)
{
const bool include_dirs = contains(prefix.substr(0, cursor_pos), '/');
auto c = transformed(m_buffers,
[include_dirs](const safe_ptr<Buffer>& buffer) -> String {
String name = buffer->display_name();
if (not include_dirs and buffer->flags() & Buffer::Flags::File)
{
ByteCount pos = name.find_last_of('/');
if (pos != (int)String::npos)
return name.substr(pos+1);
}
return name;
});
return complete(prefix, cursor_pos, c, prefix_match, subsequence_match);
}
void BufferManager::clear_buffer_trash()
{
while (not m_buffer_trash.empty())

3
src/buffer_manager.hh
View File

@ -34,9 +34,6 @@ public:
void backup_modified_buffers();
CandidateList complete_buffer_name(StringView prefix,
ByteCount cursor_pos = -1);
void clear_buffer_trash();
private:
BufferList m_buffers;

23
src/commands.cc
View File

@ -54,10 +54,26 @@ const PerArgumentCommandCompleter filename_completer({
cursor_pos) }; }
});
static CandidateList complete_buffer_name(StringView prefix, ByteCount cursor_pos)
{
const bool include_dirs = contains(prefix.substr(0, cursor_pos), '/');
auto c = transformed(BufferManager::instance(),
[include_dirs](const safe_ptr<Buffer>& buffer) -> String {
String name = buffer->display_name();
if (not include_dirs and buffer->flags() & Buffer::Flags::File)
{
ByteCount pos = name.find_last_of('/');
if (pos != (int)String::npos)
return name.substr(pos+1);
}
return name;
});
return complete(prefix, cursor_pos, c, prefix_match, subsequence_match);
}
const PerArgumentCommandCompleter buffer_completer({
[](const Context& context, CompletionFlags flags, const String& prefix, ByteCount cursor_pos)
{ return Completions{ 0_byte, cursor_pos,
BufferManager::instance().complete_buffer_name(prefix, cursor_pos) }; }
{ return Completions{ 0_byte, cursor_pos, complete_buffer_name(prefix, cursor_pos) }; }
});
const ParameterDesc no_params{
@ -659,9 +675,8 @@ void define_command(const ParametersParser& parser, Context& context)
size_t token_to_complete, ByteCount pos_in_token)
{
const String& prefix = params[token_to_complete];
auto& bm = BufferManager::instance();
return Completions{ 0_byte, prefix.length(),
bm.complete_buffer_name(prefix, pos_in_token) };
complete_buffer_name(prefix, pos_in_token) };
};
}
else if (parser.has_option("shell-completion"))