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

Stubs for dot qualified expression built inside package directive

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-04-17 14:32:02 +04:00
parent 0eebdfcd7b
commit 3099ca6501
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDotQualifiedExpression.java
+2 -2
View File
@@ -73,8 +73,8 @@ public class JetDotQualifiedExpression extends JetExpressionImplStub<PsiJetPlace
@Nullable
private JetExpression[] getChildExpressionsByStub(@NotNull PsiJetPlaceHolderStub<JetDotQualifiedExpression> stub) {
if (stub.getParentStubOfType(JetImportDirective.class) == null) {
LOG.error("JetDotQualifiedExpression should only have stubs inside import directives.\n " +
if (stub.getParentStubOfType(JetImportDirective.class) == null && stub.getParentStubOfType(JetPackageDirective.class) == null) {
LOG.error("JetDotQualifiedExpression should only have stubs inside import or package directives.\n " +
"Stubs were created for:\n " + getText() +
"\nFile text:\n" + getContainingFile().getText());
return null;
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetDotQualifiedExpressionElementType.java
+2 -1
View File
@@ -22,6 +22,7 @@ import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression;
import org.jetbrains.jet.lang.psi.JetImportDirective;
import org.jetbrains.jet.lang.psi.JetPackageDirective;
public class JetDotQualifiedExpressionElementType extends JetPlaceHolderStubElementType<JetDotQualifiedExpression> {
public JetDotQualifiedExpressionElementType(@NotNull @NonNls String debugName) {
@@ -30,6 +31,6 @@ public class JetDotQualifiedExpressionElementType extends JetPlaceHolderStubElem
@Override
public boolean shouldCreateStub(ASTNode node) {
return PsiTreeUtil.getParentOfType(node.getPsi(), JetImportDirective.class) != null;
return PsiTreeUtil.getParentOfType(node.getPsi(), JetImportDirective.class, JetPackageDirective.class) != null;
}
}