MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Usability: Find in Path -- NOT in Whole project (IDEA-87037)

Browse Source
This commit is contained in:
Maxim.Mossienko
2016-07-01 17:40:28 +02:00
parent 22a7dc40b9
commit 58fd6390e5
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java
+10 -9
View File
@@ -105,21 +105,22 @@ public class FindInProjectUtil {
model.setModuleName(module.getName());
}
// model contains previous find in path settings
// apply explicit settings from context
if (module != null) {
model.setModuleName(module.getName());
}
Editor editor = CommonDataKeys.EDITOR.getData(dataContext);
if (model.getModuleName() == null || editor == null) {
model.setDirectoryName(directoryName);
model.setProjectScope(directoryName == null && module == null && !model.isCustomScope() || editor != null);
if (directoryName != null) {
model.setDirectoryName(directoryName);
model.setCustomScope(false); // to select "Directory: " radio button
}
// for convenience set directory name to directory of current file, note that we doesn't change default projectScope
if (directoryName == null) {
VirtualFile virtualFile = CommonDataKeys.VIRTUAL_FILE.getData(dataContext);
if (virtualFile != null && !virtualFile.isDirectory()) virtualFile = virtualFile.getParent();
if (virtualFile != null) model.setDirectoryName(virtualFile.getPresentableUrl());
}
}
// set project scope if we have no other settings
model.setProjectScope(model.getDirectoryName() == null && model.getModuleName() == null && !model.isCustomScope());
}
/**