Merge pull request #1827 from timbrel/navigation-nits

core/commands/diff.py

@@ -1003,7 +1003,7 @@ class gs_diff_navigate(GsNavigate):
     """
 
     offset = 0
-    wrap_with_force = True
+    log_position = True
 
     def get_available_regions(self):
         return [

core/commands/inline_diff.py

@@ -1096,6 +1096,7 @@ class gs_inline_diff_navigate_hunk(GsNavigate):
     position.
     """
     offset = 0
+    log_position = True
     first_region_may_expand_to_bof = False
 
     def get_available_regions(self):

core/commands/navigate.py

@@ -2,6 +2,7 @@
 from sublime_plugin import TextCommand
 
 from ..git_command import GitCommand
+from ..utils import flash
 from GitSavvy.core.view import show_region
 
 
@@ -19,6 +20,7 @@ class GsNavigate(TextCommand, GitCommand):
     show_at_center = False
     wrap = True
     wrap_with_force = False
+    log_position = False
     # For the first entry, try to show the beginning of the buffer.
     # (Usually we have some info/help text there.)
     first_region_may_expand_to_bof = True
@@ -28,7 +30,7 @@ class GsNavigate(TextCommand, GitCommand):
     def run(self, edit, forward=True):
         self.forward = forward
         sel = self.view.sel()
-        current_position = sel[0].a
+        current_position = sel[0].b
 
         available_regions = self.get_available_regions()
         if not available_regions:
@@ -41,12 +43,14 @@ def run(self, edit, forward=True):
         )
         if wanted_section is None:
             if self._just_jumped == 1:
-                window = self.view.window()
-                if window:
-                    window.status_message("press again to wrap around ...")
+                flash(self.view, "press again to wrap around ...")
             self._just_jumped -= 1
             return
 
+        if self.log_position:
+            idx = available_regions.index(wanted_section)
+            flash(self.view, f"[{idx + 1}/{len(available_regions)}]")
+
         self._just_jumped = 2
         sel.clear()
         # Position the cursor at the beginning of the section...