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

Support multiple selections per ligne when aligning

Browse Source
This commit is contained in:
Maxime Coste 2013-09-18 18:54:04 +01:00
parent ce2b0415ab
commit 03588f1b78
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/normal.cc
View File

@ -756,21 +756,35 @@ void align(Context& context)
auto get_column = [&buffer](BufferCoord coord) auto get_column = [&buffer](BufferCoord coord)
{ return buffer[coord.line].char_count_to(coord.column); }; { return buffer[coord.line].char_count_to(coord.column); };
CharCount max_col = 0; std::vector<std::vector<const Selection*>> columns;
LineCount last_line = -1;
size_t column = 0;
for (auto& sel : selections) for (auto& sel : selections)
{ {
if (sel.first().line != sel.last().line) auto line = sel.last().line;
if (sel.first().line != line)
throw runtime_error("align cannot work with multi line selections"); throw runtime_error("align cannot work with multi line selections");
max_col = std::max(get_column(sel.last()), max_col);
column = (line == last_line) ? column + 1 : 0;
if (column >= columns.size())
columns.resize(column+1);
columns[column].push_back(&sel);
last_line = line;
} }
for (auto& sel : selections) for (auto& col : columns)
{ {
CharCount padding = max_col - get_column(sel.last()); CharCount max_col = 0;
auto it = buffer.iterator_at(insert_at_begin ? sel.min() : sel.last()); for (auto& sel : col)
max_col = std::max(get_column(sel->last()), max_col);
for (auto& sel : col)
{
CharCount padding = max_col - get_column(sel->last());
auto it = buffer.iterator_at(insert_at_begin ? sel->min() : sel->last());
buffer.insert(it, String{ ' ', padding }); buffer.insert(it, String{ ' ', padding });
} }
} }
}
template<typename T> template<typename T>
class Repeated class Repeated