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

Fix captures preservation in Editor

Browse Source
This commit is contained in:
Maxime Coste 2013-01-03 18:47:02 +01:00
parent 2195d59b49
commit ae9aadb07d
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/editor.cc
View File

@ -195,13 +195,14 @@ void Editor::move_selections(LineCount offset, SelectMode mode)
void Editor::clear_selections() void Editor::clear_selections()
{ {
BufferIterator pos = m_selections.back().last(); auto& sel = m_selections.back();
auto& pos = sel.last();
if (*pos == '\n' and not pos.is_begin() and *utf8::previous(pos) != '\n') if (*pos == '\n' and not pos.is_begin() and *utf8::previous(pos) != '\n')
pos = utf8::previous(pos); pos = utf8::previous(pos);
sel.first() = pos;
Selection sel = Selection(pos, pos); m_selections.erase(m_selections.begin(), m_selections.end() - 1);
m_selections = SelectionList{ std::move(sel) };
check_invariant(); check_invariant();
} }
@ -259,7 +260,7 @@ void Editor::select(const Selector& selector, SelectMode mode)
if (mode == SelectMode::Append) if (mode == SelectMode::Append)
{ {
auto& sel = m_selections.back(); auto& sel = m_selections.back();
Selection res = selector(sel); auto res = selector(sel);
if (res.captures().empty()) if (res.captures().empty())
res.captures() = sel.captures(); res.captures() = sel.captures();
m_selections.push_back(res); m_selections.push_back(res);
@ -267,18 +268,24 @@ void Editor::select(const Selector& selector, SelectMode mode)
else if (mode == SelectMode::ReplaceLast) else if (mode == SelectMode::ReplaceLast)
{ {
auto& sel = m_selections.back(); auto& sel = m_selections.back();
sel = selector(sel); auto res = selector(sel);
sel.first() = res.first();
sel.last() = res.last();
if (not res.captures().empty())
sel.captures() = std::move(res.captures());
} }
else else
{ {
for (auto& sel : m_selections) for (auto& sel : m_selections)
{ {
Selection res = selector(sel); auto res = selector(sel);
if (mode == SelectMode::Extend) if (mode == SelectMode::Extend)
sel.merge_with(res); sel.merge_with(res);
else else
sel = std::move(res); {
sel.first() = res.first();
sel.last() = res.last();
}
if (not res.captures().empty()) if (not res.captures().empty())
sel.captures() = std::move(res.captures()); sel.captures() = std::move(res.captures());
} }