IDEA-131648 Find In Path: when search is performed explicitly inside the .idea folder (with Directory scope), don't exclude project files

This commit is contained in:
peter
2014-11-04 18:14:14 +01:00
parent 3330ff134a
commit dcb73482ef
@@ -16,6 +16,7 @@
package com.intellij.find;
import com.intellij.openapi.util.UserDataHolderBase;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.search.SearchScope;
import com.intellij.util.PatternUtil;
@@ -597,12 +598,19 @@ public class FindModel extends UserDataHolderBase implements Cloneable {
*
* @param directoryName the directory scope.
*/
public void setDirectoryName(String directoryName) {
public void setDirectoryName(@Nullable String directoryName) {
boolean changed = !StringUtil.equals(directoryName, directoryName);
this.directoryName = directoryName;
if (changed) {
notifyObservers();
}
if (directoryName != null) {
String path = FileUtil.toSystemIndependentName(directoryName);
if (path.endsWith("/.idea") || path.contains("/.idea/")) {
setSearchInProjectFiles(true);
}
}
}
/**