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

use SearchScope.contains(VirtualFile)

Browse Source
This commit is contained in:
Maxim.Mossienko
2016-11-21 16:34:28 +01:00
parent 7997b15d8c
commit caf2c9a945
4 changed files with 4 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/analysis-api/src/com/intellij/analysis/AnalysisScope.java
+1 -2
View File
@@ -222,8 +222,7 @@ public class AnalysisScope {
if (myFilesSet == null) {
if (myType == CUSTOM) {
// optimization
if (myScope instanceof GlobalSearchScope) return ((GlobalSearchScope)myScope).contains(file);
if (myScope instanceof LocalSearchScope) return ((LocalSearchScope)myScope).isInScope(file);
if (myScope != null) return myScope.contains(file);
}
if (myType == PROJECT) { //optimization
final ProjectFileIndex index = ProjectRootManager.getInstance(myProject).getFileIndex();
platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java
+1 -15
View File
@@ -35,8 +35,6 @@ import com.intellij.openapi.vfs.ReadonlyStatusHandler;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileFilter;
import com.intellij.psi.*;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.LocalSearchScope;
import com.intellij.psi.search.SearchScope;
import com.intellij.psi.util.PsiUtilCore;
import org.jetbrains.annotations.NonNls;
@@ -224,19 +222,7 @@ public class ReformatCodeAction extends AnAction implements DumbAware {
return;
}
processor.addFileFilter(new VirtualFileFilter() {
@Override
public boolean accept(@NotNull VirtualFile file) {
if (scope instanceof LocalSearchScope) {
return ((LocalSearchScope)scope).isInScope(file);
}
if (scope instanceof GlobalSearchScope) {
return ((GlobalSearchScope)scope).contains(file);
}
return false;
}
});
processor.addFileFilter(scope::contains);
}
public static void registerFileMaskFilter(@NotNull AbstractLayoutCodeProcessor processor, @Nullable String fileTypeMask) {
platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java
+1 -4
View File
@@ -255,10 +255,7 @@ public class UsageViewManagerImpl extends UsageViewManager {
if (file instanceof VirtualFileWindow) {
file = ((VirtualFileWindow)file).getDelegate();
}
if (searchScope instanceof LocalSearchScope) {
return ((LocalSearchScope)searchScope).isInScope(file);
}
return ((GlobalSearchScope)searchScope).contains(file);
return searchScope.contains(file);
}
@NotNull
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxControllerFieldSearcher.java
+1 -5
View File
@@ -20,8 +20,6 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.LocalSearchScope;
import com.intellij.psi.search.SearchScope;
import com.intellij.psi.search.searches.ReferencesSearch;
import com.intellij.psi.util.PsiUtilCore;
@@ -60,9 +58,7 @@ public class JavaFxControllerFieldSearcher implements QueryExecutor<PsiReference
if (fieldName == null) return;
final VirtualFile virtualFile = file.getViewProvider().getVirtualFile();
final SearchScope searchScope = queryParameters.getEffectiveSearchScope();
boolean contains = searchScope instanceof LocalSearchScope ? ((LocalSearchScope)searchScope).isInScope(virtualFile) :
((GlobalSearchScope)searchScope).contains(virtualFile);
if (contains) {
if (searchScope.contains(virtualFile)) {
file.accept(new XmlRecursiveElementVisitor() {
@Override
public void visitXmlAttributeValue(final XmlAttributeValue value) {