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

KtFile.getPackageFqNameByTree() never tries to access stub (EA-82168)

Browse Source
This commit is contained in:
Dmitry Jemerov
2016-11-21 20:26:13 +01:00
parent c56a72d442
commit 32be1940be
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.java
+6 -1
View File
@@ -126,6 +126,11 @@ public class KtFile extends PsiFileBase implements KtDeclarationContainer, KtAnn
StubElement<KtPackageDirective> packageDirectiveStub = stub.findChildStubByType(KtStubElementTypes.PACKAGE_DIRECTIVE); StubElement<KtPackageDirective> packageDirectiveStub = stub.findChildStubByType(KtStubElementTypes.PACKAGE_DIRECTIVE);
return packageDirectiveStub != null ? packageDirectiveStub.getPsi() : null; return packageDirectiveStub != null ? packageDirectiveStub.getPsi() : null;
} }
return getPackageDirectiveByTree();
}
@Nullable
private KtPackageDirective getPackageDirectiveByTree() {
ASTNode ast = getNode().findChildByType(KtNodeTypes.PACKAGE_DIRECTIVE); ASTNode ast = getNode().findChildByType(KtNodeTypes.PACKAGE_DIRECTIVE);
return ast != null ? (KtPackageDirective) ast.getPsi() : null; return ast != null ? (KtPackageDirective) ast.getPsi() : null;
} }
@@ -148,7 +153,7 @@ public class KtFile extends PsiFileBase implements KtDeclarationContainer, KtAnn
@NotNull @NotNull
public FqName getPackageFqNameByTree() { public FqName getPackageFqNameByTree() {
KtPackageDirective packageDirective = getPackageDirective(); KtPackageDirective packageDirective = getPackageDirectiveByTree();
if (packageDirective == null) { if (packageDirective == null) {
return FqName.ROOT; return FqName.ROOT;
} }