From 32be1940bec7b575fa972318517715a2c78ed6d1 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 21 Nov 2016 20:26:13 +0100 Subject: [PATCH] KtFile.getPackageFqNameByTree() never tries to access stub (EA-82168) --- compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.java index 371b2abfc1b..3bd30ab9e6a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.java @@ -126,6 +126,11 @@ public class KtFile extends PsiFileBase implements KtDeclarationContainer, KtAnn StubElement packageDirectiveStub = stub.findChildStubByType(KtStubElementTypes.PACKAGE_DIRECTIVE); return packageDirectiveStub != null ? packageDirectiveStub.getPsi() : null; } + return getPackageDirectiveByTree(); + } + + @Nullable + private KtPackageDirective getPackageDirectiveByTree() { ASTNode ast = getNode().findChildByType(KtNodeTypes.PACKAGE_DIRECTIVE); return ast != null ? (KtPackageDirective) ast.getPsi() : null; } @@ -148,7 +153,7 @@ public class KtFile extends PsiFileBase implements KtDeclarationContainer, KtAnn @NotNull public FqName getPackageFqNameByTree() { - KtPackageDirective packageDirective = getPackageDirective(); + KtPackageDirective packageDirective = getPackageDirectiveByTree(); if (packageDirective == null) { return FqName.ROOT; }