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

Make JetPackageDirective extend JetModifierListOwnerStub

Browse Source 
Simplify check in DeclarationsChecker to avoid AST access
This commit is contained in:
Pavel V. Talanov
2014-04-21 18:41:29 +04:00
parent ce68fe93f6
commit dd92132eff
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPackageDirective.java
+1 -1
View File
@@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.resolve.name.SpecialNames;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
public class JetPackageDirective extends JetExpressionImplStub<PsiJetPlaceHolderStub<JetPackageDirective>> implements JetReferenceExpression { public class JetPackageDirective extends JetModifierListOwnerStub<PsiJetPlaceHolderStub<JetPackageDirective>> implements JetReferenceExpression {
private String qualifiedNameCache = null; private String qualifiedNameCache = null;
public JetPackageDirective(@NotNull ASTNode node) { public JetPackageDirective(@NotNull ASTNode node) {
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java
+6 -6
View File
@@ -27,7 +27,6 @@ import org.jetbrains.jet.lang.diagnostics.Errors;
import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.*;
import org.jetbrains.jet.lang.types.checker.JetTypeChecker; import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
import org.jetbrains.jet.lexer.JetKeywordToken;
import org.jetbrains.jet.lexer.JetModifierKeywordToken; import org.jetbrains.jet.lexer.JetModifierKeywordToken;
import org.jetbrains.jet.lexer.JetTokens; import org.jetbrains.jet.lexer.JetTokens;
@@ -119,9 +118,8 @@ public class DeclarationsChecker {
JetPackageDirective packageDirective = file.getPackageDirective(); JetPackageDirective packageDirective = file.getPackageDirective();
if (packageDirective == null) return; if (packageDirective == null) return;
PsiElement firstChild = packageDirective.getFirstChild(); JetModifierList modifierList = packageDirective.getModifierList();
if (!(firstChild instanceof JetModifierList)) return; if (modifierList == null) return;
JetModifierList modifierList = (JetModifierList) firstChild;
for (JetAnnotationEntry annotationEntry : modifierList.getAnnotationEntries()) { for (JetAnnotationEntry annotationEntry : modifierList.getAnnotationEntries()) {
JetConstructorCalleeExpression calleeExpression = annotationEntry.getCalleeExpression(); JetConstructorCalleeExpression calleeExpression = annotationEntry.getCalleeExpression();
@@ -133,8 +131,10 @@ public class DeclarationsChecker {
} }
} }
for (ASTNode node : modifierList.getModifierNodes()) { for (JetModifierKeywordToken token : JetTokens.MODIFIER_KEYWORDS_ARRAY) {
trace.report(ILLEGAL_MODIFIER.on(node.getPsi(), (JetModifierKeywordToken) node.getElementType())); if (modifierList.hasModifier(token)) {
trace.report(ILLEGAL_MODIFIER.on(modifierList.getModifier(token), token));
}
} }
} }