From aeb7990cc011df8a33edb5bd9a0a141dd787881b Mon Sep 17 00:00:00 2001 From: Sergey Simonchik Date: Mon, 25 Nov 2019 15:04:15 +0300 Subject: [PATCH] update usages of deprecated EditorAction API in IncrementalFindAction GitOrigin-RevId: a83c56dc8415100fb5b59476eea41a549605e45e --- .../openapi/editor/actions/IncrementalFindAction.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/openapi/editor/actions/IncrementalFindAction.java b/platform/lang-impl/src/com/intellij/openapi/editor/actions/IncrementalFindAction.java index 3e3a662074a2..dec720e6f2bd 100644 --- a/platform/lang-impl/src/com/intellij/openapi/editor/actions/IncrementalFindAction.java +++ b/platform/lang-impl/src/com/intellij/openapi/editor/actions/IncrementalFindAction.java @@ -24,12 +24,14 @@ import com.intellij.find.FindUtil; import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; +import com.intellij.openapi.editor.Caret; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.actionSystem.EditorAction; import com.intellij.openapi.editor.actionSystem.EditorActionHandler; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; public class IncrementalFindAction extends EditorAction { public static final Key SEARCH_DISABLED = Key.create("EDITOR_SEARCH_DISABLED"); @@ -44,7 +46,7 @@ public class IncrementalFindAction extends EditorAction { } @Override - public void execute(@NotNull final Editor editor, DataContext dataContext) { + protected void doExecute(@NotNull Editor editor, @Nullable Caret caret, DataContext dataContext) { final Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(editor.getComponent())); if (!editor.isOneLineMode()) { EditorSearchSession search = EditorSearchSession.get(editor); @@ -73,7 +75,7 @@ public class IncrementalFindAction extends EditorAction { } @Override - public boolean isEnabled(Editor editor, DataContext dataContext) { + protected boolean isEnabledForCaret(@NotNull Editor editor, @NotNull Caret caret, DataContext dataContext) { if (myReplace && ConsoleViewUtil.isConsoleViewEditor(editor) && !ConsoleViewUtil.isReplaceActionEnabledForConsoleViewEditor(editor)) { return false;