Minor code corrections after review
This commit is contained in:
@@ -17,9 +17,9 @@
|
||||
package org.jetbrains.jet.lang.psi;
|
||||
|
||||
import com.intellij.lang.ASTNode;
|
||||
import kotlin.jvm.KotlinSignature;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.jetbrains.annotations.ReadOnly;
|
||||
import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue;
|
||||
|
||||
import java.util.List;
|
||||
@@ -42,15 +42,15 @@ public interface Call {
|
||||
@Nullable
|
||||
JetValueArgumentList getValueArgumentList();
|
||||
|
||||
@KotlinSignature("fun getValueArguments(): List<out ValueArgument?>")
|
||||
@ReadOnly
|
||||
@NotNull
|
||||
List<? extends ValueArgument> getValueArguments();
|
||||
|
||||
@KotlinSignature("fun getFunctionLiteralArguments(): List<JetFunctionLiteralArgument>")
|
||||
@ReadOnly
|
||||
@NotNull
|
||||
List<JetFunctionLiteralArgument> getFunctionLiteralArguments();
|
||||
|
||||
@KotlinSignature("fun getTypeArguments(): List<JetTypeProjection>")
|
||||
@ReadOnly
|
||||
@NotNull
|
||||
List<JetTypeProjection> getTypeArguments();
|
||||
|
||||
|
||||
@@ -19,6 +19,7 @@ package org.jetbrains.jet.lang.resolve.calls.util;
|
||||
import com.intellij.lang.ASTNode;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.jetbrains.annotations.ReadOnly;
|
||||
import org.jetbrains.jet.lang.psi.*;
|
||||
import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue;
|
||||
|
||||
@@ -64,6 +65,7 @@ public class DelegatingCall implements Call {
|
||||
|
||||
@Override
|
||||
@NotNull
|
||||
@ReadOnly
|
||||
public List<? extends ValueArgument> getValueArguments() {
|
||||
return delegate.getValueArguments();
|
||||
}
|
||||
|
||||
@@ -286,7 +286,7 @@ public class Converter private(val project: Project,
|
||||
.map { method ->
|
||||
val returnType = method.getReturnType()
|
||||
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
|
||||
typeConverter.convertType(returnType, Nullability.NotNull)
|
||||
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) {
|
||||
|
||||
Reference in New Issue
Block a user