Rewrite JetQualifiedExpression to kotlin and make it a trait

Move implementation to JetQualifiedExpressionImpl class
This commit is contained in:
Pavel V. Talanov
2014-03-28 18:37:56 +04:00
parent 28f169df4a
commit fed01eb003
4 changed files with 59 additions and 64 deletions
@@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode;
import org.jetbrains.annotations.NotNull;
public class JetDotQualifiedExpression extends JetQualifiedExpression {
public class JetDotQualifiedExpression extends JetQualifiedExpressionImpl {
public JetDotQualifiedExpression(@NotNull ASTNode node) {
super(node);
}
@@ -1,62 +0,0 @@
/*
* Copyright 2010-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lexer.JetToken;
import org.jetbrains.jet.lexer.JetTokens;
public abstract class JetQualifiedExpression extends JetExpressionImpl {
public JetQualifiedExpression(@NotNull ASTNode node) {
super(node);
}
@NotNull
public JetExpression getReceiverExpression() {
JetExpression left = findChildByClass(JetExpression.class);
assert left != null;
return left;
}
@Nullable @IfNotParsed
public JetExpression getSelectorExpression() {
ASTNode node = getOperationTokenNode();
while (node != null) {
PsiElement psi = node.getPsi();
if (psi instanceof JetExpression) {
return (JetExpression) psi;
}
node = node.getTreeNext();
}
return null;
}
@NotNull
public ASTNode getOperationTokenNode() {
ASTNode operationNode = getNode().findChildByType(JetTokens.OPERATIONS);
assert operationNode != null;
return operationNode;
}
@NotNull
public JetToken getOperationSign() {
return (JetToken) getOperationTokenNode().getElementType();
}
}
@@ -0,0 +1,57 @@
/*
* Copyright 2010-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.jet.lang.psi
import com.intellij.lang.ASTNode
import com.intellij.psi.PsiElement
import org.jetbrains.annotations.Nullable
import org.jetbrains.jet.lexer.JetToken
import org.jetbrains.jet.lexer.JetTokens
public trait JetQualifiedExpression : JetExpression {
public fun getReceiverExpression(): JetExpression
public fun getSelectorExpression(): JetExpression?
public fun getOperationTokenNode(): ASTNode {
val operationNode = getNode()!!.findChildByType(JetTokens.OPERATIONS)
return operationNode!!
}
public fun getOperationSign(): JetToken {
return getOperationTokenNode().getElementType() as JetToken
}
}
public abstract class JetQualifiedExpressionImpl(node: ASTNode) : JetExpressionImpl(node), JetQualifiedExpression {
public override fun getReceiverExpression(): JetExpression {
val left = findChildByClass(javaClass<JetExpression>())
return left!!
}
public override fun getSelectorExpression(): JetExpression? {
var node: ASTNode? = getOperationTokenNode()
while (node != null) {
val psi = node!!.getPsi()
if (psi is JetExpression) {
return (psi as JetExpression)
}
node = node!!.getTreeNext()
}
return null
}
}
@@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode;
import org.jetbrains.annotations.NotNull;
public class JetSafeQualifiedExpression extends JetQualifiedExpression {
public class JetSafeQualifiedExpression extends JetQualifiedExpressionImpl {
public JetSafeQualifiedExpression(@NotNull ASTNode node) {
super(node);
}