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

Minor, ValueArgument.asElement returns JetElement

Browse Source
This commit is contained in:
Alexander Udalov
2014-04-21 18:40:32 +04:00
parent f7235e9d82
commit be47897e18
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetValueArgument.java
+1 -2
View File
@@ -17,7 +17,6 @@
package org.jetbrains.jet.lang.psi; package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode; import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElement;
import com.intellij.psi.impl.source.tree.LeafPsiElement; import com.intellij.psi.impl.source.tree.LeafPsiElement;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -53,7 +52,7 @@ public class JetValueArgument extends JetElementImpl implements ValueArgument {
@NotNull @NotNull
@Override @Override
public PsiElement asElement() { public JetElement asElement() {
return this; return this;
} }
compiler/frontend/src/org/jetbrains/jet/lang/psi/ValueArgument.java
+1 -2
View File
@@ -16,7 +16,6 @@
package org.jetbrains.jet.lang.psi; package org.jetbrains.jet.lang.psi;
import com.intellij.psi.PsiElement;
import com.intellij.psi.impl.source.tree.LeafPsiElement; import com.intellij.psi.impl.source.tree.LeafPsiElement;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -32,7 +31,7 @@ public interface ValueArgument {
boolean isNamed(); boolean isNamed();
@NotNull @NotNull
PsiElement asElement(); JetElement asElement();
/* The '*' in something like foo(*arr) i.e. pass an array as a number of vararg arguments */ /* The '*' in something like foo(*arr) i.e. pass an array as a number of vararg arguments */
@Nullable @Nullable
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/CallMaker.java
+4 -4
View File
@@ -37,9 +37,9 @@ public class CallMaker {
private final JetExpression expression; 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.expression = expression;
this.reportErrorsOn = expression == null ? reportErrorsOn : expression; this.reportErrorsOn = expression == null ? reportErrorsOn : expression;
} }
@@ -61,7 +61,7 @@ public class CallMaker {
@NotNull @NotNull
@Override @Override
public PsiElement asElement() { public JetElement asElement() {
return reportErrorsOn; return reportErrorsOn;
} }
@@ -220,7 +220,7 @@ public class CallMaker {
} }
@NotNull @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); return new ExpressionValueArgument(expression, reportErrorsOn);
} }