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

src: Make C skip empty lines

Browse Source 
This commits changes the way `C` behaves when the next line is empty:
instead of stopping the selection, it will now jump to the next line
that can hold a selection as big as the current one.

The primitive's count parameter holds the maximum amount of selections
that should be added to the current one.

Closes #2061
This commit is contained in:
Frank LENORMAND 2018-06-30 13:18:50 +03:00
parent 43b72770ec
commit 266ce73de7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/normal.cc
View File

@ -1386,9 +1386,11 @@ void copy_selections_on_next_lines(Context& context, NormalParams params)
main_index = result.size(); main_index = result.size();
result.push_back(std::move(sel)); result.push_back(std::move(sel));
const LineCount height = std::max(anchor.line, cursor.line) - std::min(anchor.line, cursor.line) + 1; const LineCount height = std::max(anchor.line, cursor.line) - std::min(anchor.line, cursor.line) + 1;
for (int i = 0; i < std::max(params.count, 1); ++i) const size_t max_lines = std::max(params.count, 1);
for (size_t i = 0, nb_sels = 0; nb_sels < max_lines; ++i)
{ {
LineCount offset = direction * (i + 1) * height; LineCount offset = direction * (i + 1) * height;
const LineCount anchor_line = anchor.line + offset; const LineCount anchor_line = anchor.line + offset;
const LineCount cursor_line = cursor.line + offset; const LineCount cursor_line = cursor.line + offset;
@ -1407,6 +1409,8 @@ void copy_selections_on_next_lines(Context& context, NormalParams params)
main_index = result.size(); main_index = result.size();
result.emplace_back(BufferCoord{anchor_line, anchor_byte}, result.emplace_back(BufferCoord{anchor_line, anchor_byte},
BufferCoordAndTarget{cursor_line, cursor_byte, cursor.target}); BufferCoordAndTarget{cursor_line, cursor_byte, cursor.target});
nb_sels++;
} }
} }
} }