From 59c6fe040197f31ebdd7de6e08c56001171787d8 Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Wed, 30 Nov 2016 15:59:15 +0100 Subject: [PATCH] cleanup --- .../src/com/intellij/find/impl/FindManagerImpl.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java b/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java index 8a3c7a078aa4..1f9b4a54c4ff 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java @@ -199,21 +199,14 @@ public class FindManagerImpl extends FindManager { DataContext dataContext = e.getDataContext(); Project project = CommonDataKeys.PROJECT.getData(dataContext); Editor editor = CommonDataKeys.EDITOR.getData(dataContext); - String selection = null; + final String selection = editor != null ? editor.getSelectionModel().getSelectedText() : null; - if (editor != null) { - SelectionModel selectionModel = editor.getSelectionModel(); - if (selectionModel.hasSelection()) { - selection = selectionModel.getSelectedText(); - } - } - String finalSelection = selection; return new DataContextWrapper(dataContext) { @Nullable @Override public Object getData(@NonNls String dataId) { if (CommonDataKeys.PROJECT.is(dataId)) return project; - if (PlatformDataKeys.PREDEFINED_TEXT.is(dataId)) return finalSelection; + if (PlatformDataKeys.PREDEFINED_TEXT.is(dataId)) return selection; return super.getData(dataId); } };