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

Refactor nextbuffer command to be more idiomatic

Browse Source
This commit is contained in:
Maxime Coste 2015-04-13 11:34:21 +01:00
parent 43c03ea412
commit f93081471a
1 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/commands.cc
View File

@ -375,33 +375,6 @@ const CommandDesc buffer_cmd = {
}
};
Buffer& next_buffer(Context& context) {
auto& buffer_manager = BufferManager::instance();
if (buffer_manager.end()->get() == &context.buffer())
{
return **buffer_manager.begin();
}
else
{
bool found_current = false;
Buffer& current_buffer = context.buffer();
for (auto& it : buffer_manager)
{
Buffer& buffer = *it;
if (&buffer == &current_buffer)
{
found_current = true;
}
else if (found_current)
{
return buffer;
}
}
return **buffer_manager.begin();
}
}
const CommandDesc nextbuffer_cmd = {
"nextbuffer",
"nb",
@ -412,13 +385,22 @@ const CommandDesc nextbuffer_cmd = {
CommandCompleter{},
[](const ParametersParser& parser, Context& context)
{
Buffer& nb = next_buffer(context);
BufferManager::instance().set_last_used_buffer(nb);
const Buffer* oldbuf = &context.buffer();
auto it = find_if(BufferManager::instance(),
[oldbuf](const SafePtr<Buffer>& lhs)
{ return lhs.get() == oldbuf; });
if (&nb != &context.buffer())
kak_assert(it != BufferManager::instance().end());
if (++it == BufferManager::instance().end())
it = BufferManager::instance().begin();
Buffer* newbuf = it->get();
BufferManager::instance().set_last_used_buffer(*newbuf);
if (newbuf != oldbuf)
{
context.push_jump();
context.change_buffer(nb);
context.change_buffer(*newbuf);
}
}
};