From 8b13658eaf035f3e47e71b8cc747fe877c0aa2e0 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 May 2014 15:38:53 +0200
Subject: [PATCH] NeighborList: Don't snap in values if they match exactly

---
 .../test/utils/usertypes/test_neighborlist.py        | 12 ++++--------
 qutebrowser/utils/usertypes.py                       | 11 ++++++++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/qutebrowser/test/utils/usertypes/test_neighborlist.py b/qutebrowser/test/utils/usertypes/test_neighborlist.py
index dc4894ed8..b99a86e0c 100644
--- a/qutebrowser/test/utils/usertypes/test_neighborlist.py
+++ b/qutebrowser/test/utils/usertypes/test_neighborlist.py
@@ -277,18 +277,14 @@ class SnapInTests(TestCase):
         self.assertEqual(self.nl.idx, 2)
 
     def test_equal_bigger(self):
-        self.nl.fuzzyval = 9
+        self.nl.fuzzyval = 20
         self.assertEqual(self.nl.nextitem(), 9)
         self.assertEqual(self.nl.idx, 1)
-        self.assertEqual(self.nl.nextitem(), 1)
-        self.assertEqual(self.nl.idx, 2)
 
     def test_equal_smaller(self):
-        self.nl.fuzzyval = 9
-        self.assertEqual(self.nl.previtem(), 9)
-        self.assertEqual(self.nl.idx, 1)
-        self.assertEqual(self.nl.previtem(), 20)
-        self.assertEqual(self.nl.idx, 0)
+        self.nl.fuzzyval = 5
+        self.assertEqual(self.nl.previtem(), 1)
+        self.assertEqual(self.nl.idx, 2)
 
 
 if __name__ == '__main__':
diff --git a/qutebrowser/utils/usertypes.py b/qutebrowser/utils/usertypes.py
index 107813807..7ec1bd6b9 100644
--- a/qutebrowser/utils/usertypes.py
+++ b/qutebrowser/utils/usertypes.py
@@ -110,12 +110,17 @@ class NeighborList(collections.abc.Sequence):
         Args:
             offset: negative to get the next smaller item, positive for the
                     next bigger one.
+
+        Return:
+            True if the value snapped in (changed),
+            False when the value already was in the list.
         """
         op = operator.le if offset < 0 else operator.ge
         items = [(idx, e) for (idx, e) in enumerate(self._items)
                  if op(e, self.fuzzyval)]
         close_item = min(items, key=lambda tpl: abs(self.fuzzyval - tpl[1]))
         self.idx = close_item[0]
+        return self.fuzzyval not in self._items
 
     @property
     def items(self):
@@ -143,10 +148,10 @@ class NeighborList(collections.abc.Sequence):
             # Value has been set to something not in the list, so we snap in to
             # the closest value in the right direction and count this as one
             # step towards offset.
-            self._snap_in(offset)
-            if offset > 0:
+            snapped = self._snap_in(offset)
+            if snapped and offset > 0:
                 offset -= 1
-            else:
+            elif snapped:
                 offset += 1
             self.fuzzyval = None
         try: