From f39942863b7ee5bb268dd9fda1ed650cad4edf37 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Thu, 18 Nov 2021 16:57:05 +0100
Subject: [PATCH] Dismiss active diagnostics when hitting escape

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
---
 crates/editor/src/lib.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/editor/src/lib.rs b/crates/editor/src/lib.rs
index 2afb18d1defd553720ab08b012a3d1734d35f8bf..e5f8d101c51223794434cd29be7e8a05a8bd2c76 100644
--- a/crates/editor/src/lib.rs
+++ b/crates/editor/src/lib.rs
@@ -703,7 +703,9 @@ impl Editor {
     }
 
     pub fn cancel(&mut self, _: &Cancel, cx: &mut ViewContext<Self>) {
-        if let Some(pending_selection) = self.pending_selection.take() {
+        if self.active_diagnostics.is_some() {
+            self.dismiss_diagnostics(cx);
+        } else if let Some(pending_selection) = self.pending_selection.take() {
             let buffer = self.buffer.read(cx);
             let pending_selection = Selection {
                 id: pending_selection.id,