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

Editor: preserve captures accross movements

Browse Source
This commit is contained in:
Maxime Coste 2013-01-02 13:49:02 +01:00
parent 476363bf0d
commit a9d5f126a0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/editor.cc
View File

@ -156,7 +156,8 @@ void Editor::move_selections(CharCount offset, SelectMode mode)
auto limit = offset < 0 ? buffer().iterator_at_line_begin(last) auto limit = offset < 0 ? buffer().iterator_at_line_begin(last)
: utf8::previous(buffer().iterator_at_line_end(last)); : utf8::previous(buffer().iterator_at_line_end(last));
last = utf8::advance(last, limit, offset); last = utf8::advance(last, limit, offset);
sel = Selection(mode == SelectMode::Extend ? sel.first() : last, last); sel.first() = mode == SelectMode::Extend ? sel.first() : last;
sel.last() = last;
sel.avoid_eol(); sel.avoid_eol();
} }
sort_and_merge_overlapping(m_selections); sort_and_merge_overlapping(m_selections);
@ -170,7 +171,8 @@ void Editor::move_selections(LineCount offset, SelectMode mode)
BufferCoord pos = sel.last().coord(); BufferCoord pos = sel.last().coord();
pos.line += offset; pos.line += offset;
BufferIterator last = utf8::finish(m_buffer->iterator_at(pos, true)); BufferIterator last = utf8::finish(m_buffer->iterator_at(pos, true));
sel = Selection(mode == SelectMode::Extend ? sel.first() : last, last); sel.first() = mode == SelectMode::Extend ? sel.first() : last;
sel.last() = last;
sel.avoid_eol(); sel.avoid_eol();
} }
sort_and_merge_overlapping(m_selections); sort_and_merge_overlapping(m_selections);