From 93ae28b3c53ef4d2a4d720c537be1c336ac65e40 Mon Sep 17 00:00:00 2001 From: "Vassiliy.Kudryashov" Date: Mon, 13 Nov 2017 17:22:07 +0300 Subject: [PATCH] Find In Path: return back to 'old' setup FindModel from DataContext --- .../com/intellij/java/find/impl/FindManagerTest.java | 7 ++++--- .../src/com/intellij/find/impl/FindInProjectUtil.java | 5 +---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/java/find/impl/FindManagerTest.java b/java/java-tests/testSrc/com/intellij/java/find/impl/FindManagerTest.java index b3af4cdb9d6c..3a32090bd9de 100644 --- a/java/java-tests/testSrc/com/intellij/java/find/impl/FindManagerTest.java +++ b/java/java-tests/testSrc/com/intellij/java/find/impl/FindManagerTest.java @@ -1077,14 +1077,15 @@ public class FindManagerTest extends DaemonAnalyzerTestCase { String dirName = directory.getPresentableUrl(); FindModel model = new FindModel(); + checkContext(model, myProject, null, null, true, null, null, false); model.setDirectoryName("initialDirectoryName"); model.setModuleName("initialModuleName"); model.setProjectScope(false); model.setCustomScopeName("initialScopeName"); - checkContext(model, myProject, directory, module, false, null, moduleName, false); - checkContext(model, myProject, directory, null, false, dirName, moduleName, false);//prev module state - checkContext(model, myProject, null, null, true, dirName, moduleName, false);//prev module and dir state + checkContext(model, myProject, directory, module, false, dirName, moduleName, false); + checkContext(model, myProject, directory, null, false, dirName, moduleName, false);//prev directory state + checkContext(model, myProject, null, null, false, dirName, moduleName, false);//prev module and dir state model.setCustomScope(scope); model.setCustomScope(true); checkContext(model, myProject, null, null, false, dirName, moduleName, true);//prev module and dir state diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java b/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java index 4ddf398fa8bb..20e2fbb3389b 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java @@ -113,9 +113,6 @@ public class FindInProjectUtil { // apply explicit settings from context if (module != null) { model.setModuleName(module.getName()); - directoryName = null;// Explicit 'module' scope is more specific than 'module directory' scope - model.setCustomScope(false); - model.setDirectoryName(null); } Editor editor = CommonDataKeys.EDITOR.getData(dataContext); @@ -127,7 +124,7 @@ public class FindInProjectUtil { } // set project scope if we have no other settings - model.setProjectScope(directoryName == null && module == null && !model.isCustomScope()); + model.setProjectScope(model.getDirectoryName() == null && model.getModuleName() == null && !model.isCustomScope()); } /** @deprecated to remove in IDEA 2018 */