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

fix NPE in JavaFunctionalExpressionSearcher

Browse Source
This commit is contained in:
peter
2016-07-25 14:07:43 +02:00
parent 1482bcdfe0
commit 25805e7357
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java
+5 -4
View File
@@ -84,7 +84,7 @@ public class JavaFunctionalExpressionSearcher extends QueryExecutorBase<PsiFunct
for (PsiClass funInterface : funInterfaces) {
final GlobalSearchScope useScope;
final int expectedFunExprParamsCount;
final int samParamCount;
final PsiType samType;
try (AccessToken ignored = ReadAction.start()) {
if (!funInterface.isValid()) continue;
@@ -93,12 +93,13 @@ public class JavaFunctionalExpressionSearcher extends QueryExecutorBase<PsiFunct
final PsiMethod functionalInterfaceMethod = LambdaUtil.getFunctionalInterfaceMethod(funInterface);
LOG.assertTrue(functionalInterfaceMethod != null);
expectedFunExprParamsCount = functionalInterfaceMethod.getParameterList().getParameters().length;
samParamCount = functionalInterfaceMethod.getParameterList().getParameters().length;
samType = functionalInterfaceMethod.getReturnType();
if (samType == null) continue;
}
MultiMap<FunctionalExpressionKey, GlobalSearchScope> queries =
collectQueryKeys(useScope, funInterface, expectedFunExprParamsCount, samType, highLevelModules);
collectQueryKeys(useScope, funInterface, samParamCount, samType, highLevelModules);
for (PsiFunctionalExpression expression : getCandidates(useScope, funInterface.getProject(), queries)) {
if (!processExpression(consumer, funInterface, expression)) {
@@ -153,7 +154,7 @@ public class JavaFunctionalExpressionSearcher extends QueryExecutorBase<PsiFunct
private static MultiMap<FunctionalExpressionKey, GlobalSearchScope> collectQueryKeys(GlobalSearchScope useScope,
PsiClass aClass,
int samParamCount,
PsiType samType,
@NotNull PsiType samType,
Set<Module> candidateModules) {
MultiMap<FunctionalExpressionKey, GlobalSearchScope> queries = MultiMap.createSet();