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

Add support for adding saved selections to current ones with <a-z>

Browse Source
This commit is contained in:
Maxime Coste 2015-12-07 13:43:09 +00:00
parent 3f494c3075
commit 937bef69d9
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.asciidoc
View File

@ -432,6 +432,7 @@ using `"<reg>` prefix.
`Z` will save the current selections to the register. `Z` will save the current selections to the register.
`z` will restore the selections from the register. `z` will restore the selections from the register.
`alt-z` will add the selections from the register to the existing ones.
Jump list Jump list
~~~~~~~~~ ~~~~~~~~~

25
src/normal.cc
View File

@ -1321,6 +1321,7 @@ void save_selections(Context& context, NormalParams params)
context.print_status({format("Saved selections in register '{}'", reg), get_face("Information")}); context.print_status({format("Saved selections in register '{}'", reg), get_face("Information")});
} }
template<bool add>
void restore_selections(Context& context, NormalParams params) void restore_selections(Context& context, NormalParams params)
{ {
const char reg = to_lower(params.reg ? params.reg : '^'); const char reg = to_lower(params.reg ? params.reg : '^');
@ -1348,11 +1349,26 @@ void restore_selections(Context& context, NormalParams params)
SelectionList sel_list{buffer, std::move(sels), timestamp}; SelectionList sel_list{buffer, std::move(sels), timestamp};
if (&buffer != &context.buffer()) if (not add)
context.change_buffer(buffer); {
if (&buffer != &context.buffer())
context.change_buffer(buffer);
}
else
{
if (&buffer != &context.buffer())
throw runtime_error("Cannot add selections from another buffer");
sel_list.update();
int main_index = sel_list.size() + context.selections_write_only().main_index();
for (auto& sel : context.selections())
sel_list.push_back(std::move(sel));
sel_list.set_main_index(main_index);
sel_list.sort_and_merge_overlapping();
}
context.selections_write_only() = std::move(sel_list); context.selections_write_only() = std::move(sel_list);
context.print_status({format("Restored selections from register '{}'", reg), get_face("Information")}); context.print_status({format("Restored selections from register '{}'", reg), get_face("Information")});
} }
@ -1671,7 +1687,8 @@ static NormalCmdDesc cmds[] =
{ Key::PageUp, "scroll one page up", scroll<Key::PageUp> }, { Key::PageUp, "scroll one page up", scroll<Key::PageUp> },
{ Key::PageDown, "scroll one page down", scroll<Key::PageDown> }, { Key::PageDown, "scroll one page down", scroll<Key::PageDown> },
{ 'z', "restore selections", restore_selections }, { 'z', "restore selections", restore_selections<false> },
{ alt('z'), "append saved selections", restore_selections<true> },
{ 'Z', "save selections", save_selections }, { 'Z', "save selections", save_selections },
}; };