Minor code corrections after review

This commit is contained in:
Valentin Kipyatkov
2014-08-06 19:47:02 +04:00
parent f0078b5e0f
commit a08373fec6
4 changed files with 8 additions and 6 deletions
@@ -17,9 +17,9 @@
package org.jetbrains.jet.lang.psi; package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode; import com.intellij.lang.ASTNode;
import kotlin.jvm.KotlinSignature;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.ReadOnly;
import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue;
import java.util.List; import java.util.List;
@@ -42,15 +42,15 @@ public interface Call {
@Nullable @Nullable
JetValueArgumentList getValueArgumentList(); JetValueArgumentList getValueArgumentList();
@KotlinSignature("fun getValueArguments(): List<out ValueArgument?>") @ReadOnly
@NotNull @NotNull
List<? extends ValueArgument> getValueArguments(); List<? extends ValueArgument> getValueArguments();
@KotlinSignature("fun getFunctionLiteralArguments(): List<JetFunctionLiteralArgument>") @ReadOnly
@NotNull @NotNull
List<JetFunctionLiteralArgument> getFunctionLiteralArguments(); List<JetFunctionLiteralArgument> getFunctionLiteralArguments();
@KotlinSignature("fun getTypeArguments(): List<JetTypeProjection>") @ReadOnly
@NotNull @NotNull
List<JetTypeProjection> getTypeArguments(); List<JetTypeProjection> getTypeArguments();
@@ -19,6 +19,7 @@ package org.jetbrains.jet.lang.resolve.calls.util;
import com.intellij.lang.ASTNode; import com.intellij.lang.ASTNode;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.ReadOnly;
import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue;
@@ -64,6 +65,7 @@ public class DelegatingCall implements Call {
@Override @Override
@NotNull @NotNull
@ReadOnly
public List<? extends ValueArgument> getValueArguments() { public List<? extends ValueArgument> getValueArguments() {
return delegate.getValueArguments(); return delegate.getValueArguments();
} }
+1 -1
View File
@@ -286,7 +286,7 @@ public class Converter private(val project: Project,
.map { method -> .map { method ->
val returnType = method.getReturnType() val returnType = method.getReturnType()
val typeConverted = if (method == annotationMethods.last && returnType is PsiArrayType) val typeConverted = if (method == annotationMethods.last && returnType is PsiArrayType)
VarArgType(typeConverter.convertType(returnType.getComponentType(), Nullability.NotNull).assignNoPrototype()) VarArgType(typeConverter.convertType(returnType.getComponentType(), Nullability.NotNull))
else else
typeConverter.convertType(returnType, Nullability.NotNull) typeConverter.convertType(returnType, Nullability.NotNull)
typeConverted.assignPrototype(method.getReturnTypeElement(), noBlankLinesInheritance) typeConverted.assignPrototype(method.getReturnTypeElement(), noBlankLinesInheritance)
@@ -281,7 +281,7 @@ open class ExpressionVisitor(private val converter: Converter) : JavaElementVisi
} }
} }
return typeArgs.map { typeConverter.convertType(it).assignNoPrototype() } return typeArgs.map { typeConverter.convertType(it) }
} }
override fun visitNewExpression(expression: PsiNewExpression) { override fun visitNewExpression(expression: PsiNewExpression) {