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

use alt-J for joining and selecting the spaces replacing line breaks

Browse Source
This commit is contained in:
Maxime Coste 2013-04-23 18:54:31 +02:00
parent 72ef210e1b
commit 6913510e67
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.asciidoc
View File

@ -113,6 +113,8 @@ Changes
* _alt-p_: replace current selection with yanked text
* _alt-j_: join selected lines
* _alt-J_: join selected lines and select spaces inserted
in place of line breaks
* _>_: indent selected lines
* _<_: deindent selected lines

15
src/normal.cc
View File

@ -429,16 +429,14 @@ void split_lines(Context& context)
context.editor().multi_select(std::bind(split_selection, _1, Regex{"^"}));
}
void join(Context& context)
void join_select_spaces(Context& context)
{
Editor& editor = context.editor();
DynamicSelectionList sels{editor.buffer(), editor.selections()};
auto restore_sels = on_scope_end([&]{ editor.select((SelectionList)std::move(sels)); });
editor.select(select_whole_lines);
editor.select(select_to_eol, SelectMode::Extend);
editor.multi_select([](const Selection& sel)
{
SelectionList res = select_all_matches(sel, Regex{"\n\\h*"});
SelectionList res = select_all_matches(sel, Regex{"(\n\\h*)+"});
// remove last end of line if selected
kak_assert(std::is_sorted(res.begin(), res.end(),
[](const Selection& lhs, const Selection& rhs)
@ -450,6 +448,14 @@ void join(Context& context)
editor.insert(" ", InsertMode::Replace);
}
void join(Context& context)
{
Editor& editor = context.editor();
DynamicSelectionList sels{editor.buffer(), editor.selections()};
auto restore_sels = on_scope_end([&]{ editor.select((SelectionList)std::move(sels)); });
join_select_spaces(context);
}
template<bool matching>
void keep(Context& context)
{
@ -780,6 +786,7 @@ KeyMap keymap =
{ { Key::Modifiers::None, '[' }, select_object<SurroundFlags::ToBegin> },
{ { Key::Modifiers::Alt, 'j' }, join },
{ { Key::Modifiers::Alt, 'J' }, join_select_spaces },
{ { Key::Modifiers::Alt, 'k' }, keep<true> },
{ { Key::Modifiers::Alt, 'K' }, keep<false> },