From c6b306980b3123679d443c81de8e90f6afebb904 Mon Sep 17 00:00:00 2001 From: "Denis.Zhdanov" Date: Wed, 13 Feb 2013 15:18:21 +0400 Subject: [PATCH] IDEA-100371 Cancel sticky selection upon [Editor Actions | Escape] --- .../com/intellij/openapi/editor/actions/EscapeAction.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/EscapeAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/EscapeAction.java index e3b3032d906a..5280eb30b43b 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/EscapeAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/EscapeAction.java @@ -21,6 +21,7 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.SelectionModel; import com.intellij.openapi.editor.actionSystem.EditorAction; import com.intellij.openapi.editor.actionSystem.EditorActionHandler; +import com.intellij.openapi.editor.ex.EditorEx; /** * @author max @@ -34,6 +35,13 @@ public class EscapeAction extends EditorAction { private static class Handler extends EditorActionHandler { @Override public void execute(Editor editor, DataContext dataContext) { + if (editor instanceof EditorEx) { + EditorEx editorEx = (EditorEx)editor; + if (editorEx.isStickySelection()) { + editorEx.setStickySelection(false); + } + } + editor.getSelectionModel().removeSelection(); }