From 8d172871670fa110de8cf1cbf419a8148cecd293 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Fri, 4 Feb 2022 09:34:32 +0100
Subject: [PATCH] Move cursor to diagnostic even if the only diagnostic is
 currently shown

---
 crates/editor/src/editor.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 8c45d2e590..789ea4c0cd 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -3456,7 +3456,7 @@ impl Editor {
     pub fn show_next_diagnostic(&mut self, _: &ShowNextDiagnostic, cx: &mut ViewContext<Self>) {
         let buffer = self.buffer.read(cx).snapshot(cx);
         let selection = self.newest_selection::<usize>(&buffer);
-        let active_primary_range = self.active_diagnostics.as_ref().map(|active_diagnostics| {
+        let mut active_primary_range = self.active_diagnostics.as_ref().map(|active_diagnostics| {
             active_diagnostics
                 .primary_range
                 .to_offset(&buffer)
@@ -3503,8 +3503,10 @@ impl Editor {
             } else if search_start == 0 {
                 break;
             } else {
-                // Cycle around to the start of the buffer.
+                // Cycle around to the start of the buffer, potentially moving back to the start of
+                // the currently active diagnostic.
                 search_start = 0;
+                active_primary_range.take();
             }
         }
     }