Change selection extension code to be simpler

Selection extension now just keeps the anchor in place insead of trying to be smart depending on the direction of selections.
2017-08-18 08:49:37 +07:00 · 2017-08-18 08:49:37 +07:00 · 609a8ee8c7
commit 609a8ee8c7
parent 1688332d12
6 changed files with 5 additions and 9 deletions
--- a/src/selection.cc
+++ b/src/selection.cc
@ -10,10 +10,6 @@ namespace Kakoune
 void Selection::merge_with(const Selection& other)
 {
    m_cursor = other.m_cursor;
-    if (m_anchor < m_cursor)
-        m_anchor = std::min(m_anchor, other.m_anchor);
-    if (m_anchor > m_cursor)
-        m_anchor = std::max(m_anchor, other.m_anchor);
 }

 SelectionList::SelectionList(Buffer& buffer, Selection s, size_t timestamp)
--- a/test/normal/find-char-backward-extending/selections
+++ b/test/normal/find-char-backward-extending/selections
@ -1 +1 @@
-|bar
+|b
--- a/test/normal/object/start-extending/braces/selections
+++ b/test/normal/object/start-extending/braces/selections
@ -1,2 +1,2 @@
 {
-  "foo
+  "f
--- a/test/normal/object/start-extending/brackets/selections
+++ b/test/normal/object/start-extending/brackets/selections
@ -1,2 +1,2 @@
 [
-  "foo
+  "f
--- a/test/normal/object/start-extending/sentence/selections
+++ b/test/normal/object/start-extending/sentence/selections
@ -1,2 +1,2 @@
 Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
-incididunt ut labore et dolore magna aliqua
+incididunt ut labore et d
--- a/test/normal/to-char-backward-extending/selections
+++ b/test/normal/to-char-backward-extending/selections
@ -1 +1 @@
-|bar
+|b