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

Fixed JetDeclarationStub.getParent() which was incorrectly implemented before

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-12-01 16:02:12 +03:00
parent 2daeaa38d9
commit d8bad58db8
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclarationStub.java
+3 -1
View File
@@ -24,6 +24,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.kdoc.psi.api.KDoc; import org.jetbrains.jet.kdoc.psi.api.KDoc;
import org.jetbrains.jet.lang.psi.findDocComment.FindDocCommentPackage; import org.jetbrains.jet.lang.psi.findDocComment.FindDocCommentPackage;
import org.jetbrains.jet.lang.psi.stubs.KotlinClassOrObjectStub;
abstract class JetDeclarationStub<T extends StubElement> extends JetModifierListOwnerStub<T> implements JetDeclaration { abstract class JetDeclarationStub<T extends StubElement> extends JetModifierListOwnerStub<T> implements JetDeclaration {
public JetDeclarationStub(@NotNull T stub, @NotNull IStubElementType nodeType) { public JetDeclarationStub(@NotNull T stub, @NotNull IStubElementType nodeType) {
@@ -43,7 +44,8 @@ abstract class JetDeclarationStub<T extends StubElement> extends JetModifierList
@Override @Override
public PsiElement getParent() { public PsiElement getParent() {
T stub = getStub(); T stub = getStub();
if (stub != null) { // we build stubs for local classes/objects too but they have wrong parent
if (stub != null && !(stub instanceof KotlinClassOrObjectStub && ((KotlinClassOrObjectStub) stub).isLocal())) {
return stub.getParentStub().getPsi(); return stub.getParentStub().getPsi();
} }
return super.getParent(); return super.getParent();