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

javac ast indices: remove JavaCompilerElementRetriever#asPsi()

Browse Source
This commit is contained in:
Dmitry Batkovich
2016-10-19 22:41:47 +03:00
parent 055996c26d
commit 8311f5cc2e
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/backwardRefs/JavaCompilerElementRetriever.java
+2 -14
View File
@@ -15,7 +15,6 @@
*/
package com.intellij.compiler.backwardRefs;
import com.intellij.lang.ASTNode;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
@@ -52,7 +51,7 @@ public class JavaCompilerElementRetriever {
int funExprIdx = 0;
for (StubElement<?> element : tree.getPlainList()) {
if (FUN_EXPR.contains(element.getStubType()) && indices.contains(funExprIdx++)) {
result[resIdx++] = asPsi((FunctionalExpressionStub<?>) element, psiFile, tree, foreign);
result[resIdx++] = (PsiFunctionalExpression)element.getPsi();
}
}
return result;
@@ -76,7 +75,7 @@ public class JavaCompilerElementRetriever {
for (StubElement<?> element : tree.getPlainList()) {
if (element instanceof PsiClassStub && match((PsiClassStub)element, matchers)) {
result.add(asPsi((StubBase<PsiClass>)element, psiFile, tree, foreign));
result.add(((StubBase<PsiClass>)element).getPsi());
}
}
@@ -84,17 +83,6 @@ public class JavaCompilerElementRetriever {
}
private static <T extends PsiElement> T asPsi(StubBase<T> stub, PsiFileWithStubSupport file, StubTree tree, boolean foreign) {
if (foreign) {
final T cachedPsi = (stub).getCachedPsi();
if (cachedPsi != null) return cachedPsi;
final ASTNode ast = file.findTreeForStub(tree, stub);
return ast != null ? (T)ast.getPsi() : null;
}
return stub.getPsi();
}
private static boolean match(PsiClassStub stub, Collection<InternalClassMatcher> matchers) {
for (InternalClassMatcher matcher : matchers) {
if (matcher.matches(stub)) {