azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stubs: simplify JetStubElementType#shouldCreateStub()

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-06-23 18:02:04 +04:00
parent 38d4ca5469
commit eec6fbb205
2 changed files with 11 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFileElementType.java
+1 -1
View File
@@ -36,7 +36,7 @@ import org.jetbrains.jet.plugin.JetLanguage;
import java.io.IOException;
public class JetFileElementType extends IStubFileElementType<PsiJetFileStub> {
public static final int STUB_VERSION = 28;
public static final int STUB_VERSION = 29;
public JetFileElementType() {
super("jet.FILE", JetLanguage.INSTANCE);
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetStubElementType.java
+10 -48
View File
@@ -23,13 +23,14 @@ import com.intellij.psi.stubs.IndexSink;
import com.intellij.psi.stubs.StubElement;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.tree.IStubFileElementType;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.ArrayFactory;
import com.intellij.util.ArrayUtil;
import com.intellij.util.ReflectionUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.psi.JetClassOrObject;
import org.jetbrains.jet.lang.psi.JetElementImplStub;
import org.jetbrains.jet.lang.psi.JetFunction;
import org.jetbrains.jet.lang.psi.JetProperty;
import org.jetbrains.jet.plugin.JetLanguage;
import java.lang.reflect.Array;
@@ -37,9 +38,6 @@ import java.lang.reflect.Constructor;
public abstract class JetStubElementType<StubT extends StubElement, PsiT extends JetElementImplStub<?>> extends IStubElementType<StubT, PsiT> {
@SuppressWarnings("unchecked")
private static final Class<? extends PsiElement>[] ALWAYS_CREATE_STUB_FOR = new Class[] { JetClass.class, JetObjectDeclaration.class };
@NotNull
private final Constructor<PsiT> byNodeConstructor;
@NotNull
@@ -93,11 +91,14 @@ public abstract class JetStubElementType<StubT extends StubElement, PsiT extends
@Override
public boolean shouldCreateStub(ASTNode node) {
PsiElement psi = node.getPsi();
if (ArrayUtil.contains(psi.getClass(), (Object[]) ALWAYS_CREATE_STUB_FOR)) {
if (psi instanceof JetClassOrObject) {
return true;
}
if (psi instanceof JetDeclaration) {
return shouldCreateStubForDeclaration((JetDeclaration) psi);
if (psi instanceof JetFunction) {
return !((JetFunction) psi).isLocal();
}
if (psi instanceof JetProperty) {
return !((JetProperty) psi).isLocal();
}
return createStubDependingOnParent(node);
}
@@ -114,45 +115,6 @@ public abstract class JetStubElementType<StubT extends StubElement, PsiT extends
return false;
}
private static boolean shouldCreateStubForDeclaration(@NotNull JetDeclaration declaration) {
// Do not create stubs inside function literals
//noinspection unchecked
if (PsiTreeUtil.getParentOfType(declaration, JetFunctionLiteral.class, false, ALWAYS_CREATE_STUB_FOR) != null) {
return false;
}
// Don't create stubs if declaration is inside function or property accessor with block
//noinspection unchecked
JetBlockExpression blockExpression =
PsiTreeUtil.getParentOfType(declaration, JetBlockExpression.class, false, ALWAYS_CREATE_STUB_FOR);
if (blockExpression != null) {
return false;
}
// Don't create stubs if declaration is inside other declaration with expression initializer
Class<? extends PsiElement>[] stopAt = ArrayUtil.append(ALWAYS_CREATE_STUB_FOR, JetBlockExpression.class);
@SuppressWarnings("unchecked") JetWithExpressionInitializer withInitializer =
PsiTreeUtil.getParentOfType(declaration, JetWithExpressionInitializer.class, true, stopAt);
if (withInitializer != null) {
JetExpression initializer = withInitializer.getInitializer();
if (PsiTreeUtil.isAncestor(initializer, declaration, true)) {
return false;
}
}
// Don't create stubs if declaration is inside property delegate
@SuppressWarnings("unchecked") JetPropertyDelegate delegate = PsiTreeUtil.getParentOfType(declaration, JetPropertyDelegate.class, true, stopAt);
if (delegate != null) {
JetExpression delegateExpression = delegate.getExpression();
if (PsiTreeUtil.isAncestor(delegateExpression, declaration, true)) {
return false;
}
}
return true;
}
@Override
public void indexStub(@NotNull StubT stub, @NotNull IndexSink sink) {
// do not force inheritors to implement this method