MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

JavaFunctionalExpressionIndex: support array initializers

Browse Source
This commit is contained in:
Tagir Valeev
2019-03-15 10:43:17 +07:00
parent 02dbd03cb2
commit 62bbfeaa3c
4 changed files with 56 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
java/java-indexing-impl/src/com/intellij/psi/impl/java/JavaFunctionalExpressionIndex.java
View File

@@ -159,19 +159,34 @@ public class JavaFunctionalExpressionIndex extends FileBasedIndexExtension<Funct
@NotNull
private static String calcExprType(LighterASTNode funExpr, FileLocalResolver resolver) {
LighterASTNode scope = skipExpressionsUp(resolver.getLightTree(), funExpr, TokenSet.create(LOCAL_VARIABLE, FIELD, TYPE_CAST_EXPRESSION, RETURN_STATEMENT, ASSIGNMENT_EXPRESSION));
LighterAST tree = resolver.getLightTree();
LighterASTNode scope = skipExpressionsUp(tree, funExpr, TokenSet.create(
LOCAL_VARIABLE, FIELD, TYPE_CAST_EXPRESSION, RETURN_STATEMENT, ASSIGNMENT_EXPRESSION, ARRAY_INITIALIZER_EXPRESSION));
int arrayDepth = 0;
while (scope != null && scope.getTokenType() == ARRAY_INITIALIZER_EXPRESSION) {
scope = tree.getParent(scope);
// should be either new-expression or variable/field declaration
arrayDepth++;
}
if (scope != null) {
if (scope.getTokenType() == ASSIGNMENT_EXPRESSION) {
LighterASTNode lValue = findExpressionChild(scope, resolver.getLightTree());
LighterASTNode lValue = findExpressionChild(scope, tree);
scope = lValue == null ? null : resolver.resolveLocally(lValue).getTarget();
}
else if (scope.getTokenType() == RETURN_STATEMENT) {
scope = LightTreeUtil.getParentOfType(resolver.getLightTree(), scope,
scope = LightTreeUtil.getParentOfType(tree, scope,
TokenSet.create(METHOD),
TokenSet.orSet(ElementType.MEMBER_BIT_SET, TokenSet.create(LAMBDA_EXPRESSION)));
}
else if (scope.getTokenType() == NEW_EXPRESSION) {
assert arrayDepth > 0;
if (arrayDepth != LightTreeUtil.getChildrenOfType(tree, scope, JavaTokenType.LBRACKET).size()) return "";
LighterASTNode typeRef = LightTreeUtil.firstChildOfType(tree, scope, JAVA_CODE_REFERENCE);
String refName = JavaLightTreeUtil.getNameIdentifierText(tree, typeRef);
return StringUtil.notNullize(refName);
}
}
return StringUtil.notNullize(scope == null ? null : resolver.getShortClassTypeName(scope));
return StringUtil.notNullize(scope == null ? null : resolver.getShortClassTypeName(scope, arrayDepth));
}
private static int getArgIndex(List<? extends LighterASTNode> args, LighterASTNode expr) {