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

functional interface searcher: optimization to distinguish by return type

Browse Source
This commit is contained in:
Anna.Kozlova
2016-05-17 17:41:48 +02:00
parent 73edb8d65c
commit 3457915069
1 changed files with 19 additions and 8 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
+19 -8
View File
@@ -15,7 +15,6 @@
*/
package com.intellij.psi.impl.search;
import com.google.common.annotations.VisibleForTesting;
import com.intellij.openapi.application.*;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.module.Module;
@@ -64,6 +63,7 @@ public class JavaFunctionalExpressionSearcher extends QueryExecutorBase<PsiFunct
final PsiClass aClass;
final Project project;
final int expectedFunExprParamsCount;
final boolean isVoid;
AccessToken token = ReadAction.start();
try {
@@ -76,9 +76,10 @@ public class JavaFunctionalExpressionSearcher extends QueryExecutorBase<PsiFunct
useScope = convertToGlobalScope(project, queryParameters.getEffectiveSearchScope());
final MethodSignature functionalInterfaceMethod = LambdaUtil.getFunction(aClass);
final PsiMethod functionalInterfaceMethod = LambdaUtil.getFunctionalInterfaceMethod(aClass);
LOG.assertTrue(functionalInterfaceMethod != null);
expectedFunExprParamsCount = functionalInterfaceMethod.getParameterTypes().length;
expectedFunExprParamsCount = functionalInterfaceMethod.getParameterList().getParameters().length;
isVoid = PsiType.VOID.equals(functionalInterfaceMethod.getReturnType());
} finally {
token.finish();
}
@@ -86,7 +87,7 @@ public class JavaFunctionalExpressionSearcher extends QueryExecutorBase<PsiFunct
//collect all files with '::' and '->' in useScope
Set<VirtualFile> candidateFiles = getFilesWithFunctionalExpressionsScope(project, new JavaSourceFilterScope(useScope));
if (candidateFiles.size() < SMART_SEARCH_THRESHOLD) {
searchInFiles(aClass, consumer, candidateFiles, expectedFunExprParamsCount);
searchInFiles(aClass, consumer, candidateFiles, expectedFunExprParamsCount, isVoid);
return;
}
@@ -126,7 +127,7 @@ public class JavaFunctionalExpressionSearcher extends QueryExecutorBase<PsiFunct
//search for functional expressions in non-call contexts
collectFilesWithTypeOccurrencesAndFieldAssignments(aClass, candidateScope, filesToProcess);
searchInFiles(aClass, consumer, filesToProcess, expectedFunExprParamsCount);
searchInFiles(aClass, consumer, filesToProcess, expectedFunExprParamsCount, isVoid);
}
@NotNull
@@ -147,14 +148,14 @@ public class JavaFunctionalExpressionSearcher extends QueryExecutorBase<PsiFunct
}
private static void searchInFiles(final PsiClass aClass,
final Processor<PsiFunctionalExpression> consumer,
Set<VirtualFile> filesToProcess, final int expectedFunExprParamsCount) {
final Processor<PsiFunctionalExpression> consumer,
Set<VirtualFile> filesToProcess, final int expectedFunExprParamsCount, boolean isVoid) {
LOG.info("#usage files: " + filesToProcess.size());
process(filesToProcess, new ReadActionProcessor<VirtualFile>() {
@Override
public boolean processInReadAction(VirtualFile file) {
//resolve functional expressions to ensure that functional expression type is appropriate
return processFileWithFunctionalInterfaces(aClass, expectedFunExprParamsCount, consumer, file);
return processFileWithFunctionalInterfaces(aClass, expectedFunExprParamsCount, isVoid, consumer, file);
}
});
}
@@ -296,6 +297,7 @@ public class JavaFunctionalExpressionSearcher extends QueryExecutorBase<PsiFunct
private static boolean processFileWithFunctionalInterfaces(final PsiClass aClass,
final int expectedParamCount,
boolean isVoid,
final Processor<PsiFunctionalExpression> consumer,
VirtualFile file) {
final PsiFile psiFile = aClass.getManager().findFile(file);
@@ -323,6 +325,15 @@ public class JavaFunctionalExpressionSearcher extends QueryExecutorBase<PsiFunct
public void visitLambdaExpression(PsiLambdaExpression expression) {
super.visitLambdaExpression(expression);
if (expression.getParameterList().getParametersCount() == expectedParamCount) {
if (isVoid) {
final PsiElement body = expression.getBody();
if (body instanceof PsiCodeBlock) {
final PsiReturnStatement[] statements = PsiUtil.findReturnStatements((PsiCodeBlock)body);
for (PsiReturnStatement statement : statements) {
if (statement.getReturnValue() != null) return;
}
}
}
visitFunctionalExpression(expression);
}
}