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

removed confusing checkInheritance parameter

Browse Source
This commit is contained in:
Alexey Kudravtsev
2016-05-27 15:48:07 +03:00
parent 1f2fb7f51d
commit 7c86c5d7b1
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameCompletionContributor.java
+1 -1
View File
@@ -195,7 +195,7 @@ public class JavaClassNameCompletionContributor extends CompletionContributor {
GlobalSearchScope scope = context.getResolveScope();
PsiClass annotation = JavaPsiFacade.getInstance(context.getProject()).findClass(CommonClassNames.JAVA_LANG_ANNOTATION_ANNOTATION, scope);
if (annotation != null) {
DirectClassInheritorsSearch.search(annotation, scope, false, false).forEach(psiClass -> {
DirectClassInheritorsSearch.search(annotation, scope, false).forEach(psiClass -> {
if (!psiClass.isAnnotationType() || psiClass.getQualifiedName() == null) return true;
String name = ObjectUtils.assertNotNull(psiClass.getName());
java/java-indexing-api/src/com/intellij/psi/search/searches/DirectClassInheritorsSearch.java
+8 -3
View File
@@ -71,7 +71,8 @@ public class DirectClassInheritorsSearch extends ExtensibleQueryFactory<PsiClass
}
}
private DirectClassInheritorsSearch() {}
private DirectClassInheritorsSearch() {
}
@NotNull
public static Query<PsiClass> search(@NotNull PsiClass aClass) {
@@ -85,14 +86,18 @@ public class DirectClassInheritorsSearch extends ExtensibleQueryFactory<PsiClass
@NotNull
public static Query<PsiClass> search(@NotNull PsiClass aClass, @NotNull SearchScope scope, boolean includeAnonymous) {
return search(aClass, scope, includeAnonymous, true);
return INSTANCE.createUniqueResultsQuery(new SearchParameters(aClass, scope, includeAnonymous, true));
}
/**
* @deprecated use {@link #search(PsiClass, SearchScope, boolean)} instead
*/
@NotNull
@Deprecated
public static Query<PsiClass> search(@NotNull PsiClass aClass,
@NotNull SearchScope scope,
boolean includeAnonymous,
final boolean checkInheritance) {
return INSTANCE.createUniqueResultsQuery(new SearchParameters(aClass, scope, includeAnonymous, checkInheritance));
return search(aClass, scope, includeAnonymous);
}
}
java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java
+1
View File
@@ -54,6 +54,7 @@ public class JavaDirectInheritorsSearcher implements QueryExecutor<PsiClass, Dir
@Override
public boolean execute(@NotNull final DirectClassInheritorsSearch.SearchParameters parameters, @NotNull final Processor<PsiClass> consumer) {
final PsiClass baseClass = parameters.getClassToProcess();
assert parameters.isCheckInheritance();
final SearchScope useScope = ApplicationManager.getApplication().runReadAction((Computable<SearchScope>)baseClass::getUseScope);