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

add alt-& which aligns inserting spaces before selection start

Browse Source
This commit is contained in:
Maxime Coste 2013-09-02 13:30:46 +01:00
parent 70cd671ef6
commit 96fc340a5c
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/normal.cc
View File

@ -504,7 +504,7 @@ void split_lines(Context& context)
res.push_back({line, {line, buffer[line].length()-1}}); res.push_back({line, {line, buffer[line].length()-1}});
res.push_back({max.line, max}); res.push_back({max.line, max});
return res; return res;
}); });
} }
void join_select_spaces(Context& context) void join_select_spaces(Context& context)
@ -748,6 +748,7 @@ void jump(Context& context)
context.editor().select(SelectionList{ jump }); context.editor().select(SelectionList{ jump });
} }
template<bool insert_at_begin>
void align(Context& context) void align(Context& context)
{ {
auto& selections = context.editor().selections(); auto& selections = context.editor().selections();
@ -757,12 +758,17 @@ void align(Context& context)
CharCount max_col = 0; CharCount max_col = 0;
for (auto& sel : selections) for (auto& sel : selections)
{
if (sel.first().line != sel.last().line)
throw runtime_error("align cannot work with multi line selections");
max_col = std::max(get_column(sel.last()), max_col); max_col = std::max(get_column(sel.last()), max_col);
}
for (auto& sel : selections) for (auto& sel : selections)
{ {
CharCount padding = max_col - get_column(sel.last()); CharCount padding = max_col - get_column(sel.last());
buffer.insert(buffer.iterator_at(sel.last()), String{ ' ', padding }); auto it = buffer.iterator_at(insert_at_begin ? sel.min() : sel.last());
buffer.insert(it, String{ ' ', padding });
} }
} }
@ -931,9 +937,10 @@ KeyMap keymap =
{ { Key::Modifiers::None, '`' }, for_each_char<to_lower> }, { { Key::Modifiers::None, '`' }, for_each_char<to_lower> },
{ { Key::Modifiers::None, '~' }, for_each_char<to_upper> }, { { Key::Modifiers::None, '~' }, for_each_char<to_upper> },
{ { Key::Modifiers::Alt, '`' }, for_each_char<swap_case> }, { { Key::Modifiers::Alt, '`' }, for_each_char<swap_case> },
{ { Key::Modifiers::None, '&' }, align }, { { Key::Modifiers::None, '&' }, align<false> },
{ { Key::Modifiers::Alt, '&' }, align<true> },
{ Key::Left, move<CharCount, Backward> }, { Key::Left, move<CharCount, Backward> },
{ Key::Down, move<LineCount, Forward> }, { Key::Down, move<LineCount, Forward> },