diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetValueArgument.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetValueArgument.java index 05e3c392b36..812a245abf1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetValueArgument.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetValueArgument.java @@ -17,7 +17,6 @@ package org.jetbrains.jet.lang.psi; import com.intellij.lang.ASTNode; -import com.intellij.psi.PsiElement; import com.intellij.psi.impl.source.tree.LeafPsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -53,7 +52,7 @@ public class JetValueArgument extends JetElementImpl implements ValueArgument { @NotNull @Override - public PsiElement asElement() { + public JetElement asElement() { return this; } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/ValueArgument.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/ValueArgument.java index 36556031dd8..2fe0c487141 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/ValueArgument.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/ValueArgument.java @@ -16,7 +16,6 @@ package org.jetbrains.jet.lang.psi; -import com.intellij.psi.PsiElement; import com.intellij.psi.impl.source.tree.LeafPsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -32,7 +31,7 @@ public interface ValueArgument { boolean isNamed(); @NotNull - PsiElement asElement(); + JetElement asElement(); /* The '*' in something like foo(*arr) i.e. pass an array as a number of vararg arguments */ @Nullable diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/CallMaker.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/CallMaker.java index 5a8c5fc55a3..6f99900b7ed 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/CallMaker.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/CallMaker.java @@ -37,9 +37,9 @@ public class CallMaker { private final JetExpression expression; - private final PsiElement reportErrorsOn; + private final JetElement reportErrorsOn; - private ExpressionValueArgument(@Nullable JetExpression expression, @NotNull PsiElement reportErrorsOn) { + private ExpressionValueArgument(@Nullable JetExpression expression, @NotNull JetElement reportErrorsOn) { this.expression = expression; this.reportErrorsOn = expression == null ? reportErrorsOn : expression; } @@ -61,7 +61,7 @@ public class CallMaker { @NotNull @Override - public PsiElement asElement() { + public JetElement asElement() { return reportErrorsOn; } @@ -220,7 +220,7 @@ public class CallMaker { } @NotNull - public static ValueArgument makeValueArgument(@Nullable JetExpression expression, @NotNull PsiElement reportErrorsOn) { + public static ValueArgument makeValueArgument(@Nullable JetExpression expression, @NotNull JetElement reportErrorsOn) { return new ExpressionValueArgument(expression, reportErrorsOn); }