From 23a2033c0fc32c3b6079bf7b1eb819e7809a4977 Mon Sep 17 00:00:00 2001
From: Dmitry Batrak <Dmitry.Batrak@jetbrains.com>
Date: Tue, 17 Oct 2017 11:35:07 +0300
Subject: [PATCH] IDEA-179908 Esc should cancel multiple carets first

---
 .../com/intellij/codeInsight/highlighting/EscapeHandler.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/EscapeHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/EscapeHandler.java
index 176f113a019e..ed94c053cdc6 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/EscapeHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/EscapeHandler.java
@@ -28,7 +28,7 @@ public class EscapeHandler extends EditorActionHandler {
     editor.setHeaderComponent(null);
 
     Project project = CommonDataKeys.PROJECT.getData(dataContext);
-    if (project != null) {
+    if (project != null && editor.getCaretModel().getCaretCount() == 1 && !editor.getSelectionModel().hasSelection()) {
       HighlightManagerImpl highlightManager = (HighlightManagerImpl)HighlightManager.getInstance(project);
       if (highlightManager != null && highlightManager.hideHighlights(editor, HighlightManager.HIDE_BY_ESCAPE | HighlightManager.HIDE_BY_ANY_KEY)) {