From d40219dfb21ba92f06f8f1a7de790063ec68b85e Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 5 May 2017 15:10:48 +0200 Subject: [PATCH] JavaFunctionalExpressionSearcher: check for class validity when read action starts (EA-100225 - IAE: ObjectUtils.notNull) --- .../psi/impl/search/JavaFunctionalExpressionSearcher.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java index 6cb9ffc256e7..ab80acee7529 100644 --- a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java +++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java @@ -293,8 +293,11 @@ public class JavaFunctionalExpressionSearcher extends QueryExecutorBase generateKeys() { + String name = samClass.isValid() ? samClass.getName() : null; + if (name == null) return Collections.emptyList(); + List result = new ArrayList<>(); - for (String lambdaType : new String[]{assertNotNull(samClass.getName()), ""}) { + for (String lambdaType : new String[]{assertNotNull(name), ""}) { for (int lambdaParamCount : new int[]{FunctionalExpressionKey.UNKNOWN_PARAM_COUNT, samParamCount}) { result.add(new FunctionalExpressionKey(lambdaParamCount, FunctionalExpressionKey.CoarseType.UNKNOWN, lambdaType)); if (isVoid) {