提交 73dab58b 编写于 作者: A Andrey Breslav

Type projection is not a declaration

上级 8b00bb1c
......@@ -18,7 +18,6 @@ package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lexer.JetToken;
......@@ -30,13 +29,14 @@ public abstract class JetDeclaration extends JetExpression implements JetModifie
super(node);
}
@Nullable
@Override
public JetModifierList getModifierList() {
return (JetModifierList) findChildByType(JetNodeTypes.MODIFIER_LIST);
}
@Override
public boolean hasModifier(JetToken modifier) {
JetModifierList modifierList = getModifierList();
return modifierList == null ? false : modifierList.hasModifier(modifier);
return modifierList != null && modifierList.hasModifier(modifier);
}
}
......@@ -21,16 +21,28 @@ import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lexer.JetToken;
import org.jetbrains.jet.lexer.JetTokens;
/**
* @author abreslav
*/
public class JetTypeProjection extends JetDeclaration {
public class JetTypeProjection extends JetElement implements JetModifierListOwner {
public JetTypeProjection(@NotNull ASTNode node) {
super(node);
}
@Override
public JetModifierList getModifierList() {
return (JetModifierList) findChildByType(JetNodeTypes.MODIFIER_LIST);
}
@Override
public boolean hasModifier(JetToken modifier) {
JetModifierList modifierList = getModifierList();
return modifierList != null && modifierList.hasModifier(modifier);
}
@NotNull
public JetProjectionKind getProjectionKind() {
ASTNode projectionNode = getProjectionNode();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册