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

Make JetSimpleNameExpression a trait

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-03-26 17:29:55 +04:00
parent 6413691c33
commit e84eebec5b
4 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLabelReferenceExpression.kt
+1 -1
View File
@@ -18,4 +18,4 @@ package org.jetbrains.jet.lang.psi
import com.intellij.lang.ASTNode import com.intellij.lang.ASTNode
public class JetLabelReferenceExpression(node: ASTNode) : JetSimpleNameExpression(node) public class JetLabelReferenceExpression(node: ASTNode) : JetSimpleNameExpressionImpl(node)
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNameReferenceExpression.kt
+1 -1
View File
@@ -18,4 +18,4 @@ package org.jetbrains.jet.lang.psi
import com.intellij.lang.ASTNode import com.intellij.lang.ASTNode
public class JetNameReferenceExpression(node: ASTNode) : JetSimpleNameExpression(node) public class JetNameReferenceExpression(node: ASTNode) : JetSimpleNameExpressionImpl(node)
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetOperationReferenceExpression.kt
+1 -1
View File
@@ -18,4 +18,4 @@ package org.jetbrains.jet.lang.psi
import com.intellij.lang.ASTNode import com.intellij.lang.ASTNode
public class JetOperationReferenceExpression(node: ASTNode) : JetSimpleNameExpression(node) public class JetOperationReferenceExpression(node: ASTNode) : JetSimpleNameExpressionImpl(node)
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.kt
+15 -9
View File
@@ -27,7 +27,7 @@ import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.jet.lexer.JetTokens.* import org.jetbrains.jet.lexer.JetTokens.*
import org.jetbrains.jet.lang.types.expressions.OperatorConventions import org.jetbrains.jet.lang.types.expressions.OperatorConventions
public abstract class JetSimpleNameExpression(node: ASTNode) : JetExpressionImpl(node), JetReferenceExpression { public trait JetSimpleNameExpression : JetReferenceExpression {
public fun getReceiverExpression(): JetExpression? { public fun getReceiverExpression(): JetExpression? {
val parent = getParent() val parent = getParent()
@@ -86,24 +86,30 @@ public abstract class JetSimpleNameExpression(node: ASTNode) : JetExpressionImpl
return Name.identifierNoValidate(name) return Name.identifierNoValidate(name)
} }
public fun getReferencedNameElement(): PsiElement { public fun getReferencedNameElement(): PsiElement
return findChildByType(REFERENCE_TOKENS) ?:
findChildByType(JetExpressionParsing.ALL_OPERATIONS) ?:
this
}
public fun getIdentifier(): PsiElement? { public fun getIdentifier(): PsiElement?
return findChildByType(JetTokens.IDENTIFIER)
}
public fun getReferencedNameElementType(): IElementType { public fun getReferencedNameElementType(): IElementType {
return getReferencedNameElement().getNode()!!.getElementType()!! return getReferencedNameElement().getNode()!!.getElementType()!!
} }
}
abstract class JetSimpleNameExpressionImpl(node: ASTNode) : JetExpressionImpl(node), JetSimpleNameExpression {
public override fun getIdentifier(): PsiElement? {
return findChildByType(JetTokens.IDENTIFIER)
}
override fun <R, D> accept(visitor: JetVisitor<R, D>, data: D?): R { override fun <R, D> accept(visitor: JetVisitor<R, D>, data: D?): R {
return visitor.visitSimpleNameExpression(this, data) as R return visitor.visitSimpleNameExpression(this, data) as R
} }
public override fun getReferencedNameElement(): PsiElement {
return findChildByType(REFERENCE_TOKENS) ?:
findChildByType(JetExpressionParsing.ALL_OPERATIONS) ?:
this
}
class object { class object {
public val REFERENCE_TOKENS: TokenSet = TokenSet.create(LABEL_IDENTIFIER, IDENTIFIER, FIELD_IDENTIFIER, THIS_KEYWORD, SUPER_KEYWORD) public val REFERENCE_TOKENS: TokenSet = TokenSet.create(LABEL_IDENTIFIER, IDENTIFIER, FIELD_IDENTIFIER, THIS_KEYWORD, SUPER_KEYWORD)
} }