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

Refactor nextbuffer_cmd

Browse Source
This commit is contained in:
Eike Plack 2015-04-15 02:43:16 +02:00
parent 0f9b210e3f
commit 2cf45ddb21
1 changed files with 50 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/commands.cc
View File

@ -377,34 +377,59 @@ const CommandDesc buffer_cmd = {
}
};
const CommandDesc nextbuffer_cmd = {
"nextbuffer",
"nb",
"nextbuffer: move to the next buffer in the list",
template<bool next>
void cycle_buffer(const ParametersParser& parser, Context& context)
{
Buffer* oldbuf = &context.buffer();
auto it = find_if(BufferManager::instance(),
[oldbuf](const SafePtr<Buffer>& lhs)
{ return lhs.get() == oldbuf; });
kak_assert(it != BufferManager::instance().end());
if (not next)
{
if (it == BufferManager::instance().begin())
it = BufferManager::instance().end();
it = std::prev(it,1);
}
else
{
if (++it == BufferManager::instance().end())
it = BufferManager::instance().begin();
}
Buffer* newbuf = it->get();
if (newbuf != oldbuf)
{
BufferManager::instance().set_last_used_buffer(*oldbuf);
context.push_jump();
context.change_buffer(*newbuf);
}
}
const CommandDesc buffernext_cmd = {
"buffernext",
"bn",
"buffernext: move to the next buffer in the list",
no_params,
CommandFlags::None,
CommandHelper{},
CommandCompleter{},
[](const ParametersParser& parser, Context& context)
{
Buffer* oldbuf = &context.buffer();
auto it = find_if(BufferManager::instance(),
[oldbuf](const SafePtr<Buffer>& lhs)
{ return lhs.get() == oldbuf; });
cycle_buffer<true>
};
kak_assert(it != BufferManager::instance().end());
if (++it == BufferManager::instance().end())
it = BufferManager::instance().begin();
Buffer* newbuf = it->get();
if (newbuf != oldbuf)
{
BufferManager::instance().set_last_used_buffer(*oldbuf);
context.push_jump();
context.change_buffer(*newbuf);
}
}
const CommandDesc bufferprev_cmd = {
"bufferprev",
"bp",
"bufferprev: move to the previous buffer in the list",
no_params,
CommandFlags::None,
CommandHelper{},
CommandCompleter{},
cycle_buffer<false>
};
template<bool force>
@ -1549,7 +1574,8 @@ void register_commands()
register_command(write_quit_cmd);
register_command(force_write_quit_cmd);
register_command(buffer_cmd);
register_command(nextbuffer_cmd);
register_command(buffernext_cmd);
register_command(bufferprev_cmd);
register_command(delbuf_cmd);
register_command(force_delbuf_cmd);
register_command(namebuf_cmd);