From a08373fec63eccbdad93d24890f01d6c1fd27745 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Wed, 6 Aug 2014 19:47:02 +0400
Subject: [PATCH] Minor code corrections after review

---
 .../frontend/src/org/jetbrains/jet/lang/psi/Call.java     | 8 ++++----
 .../jet/lang/resolve/calls/util/DelegatingCall.java       | 2 ++
 j2k/src/org/jetbrains/jet/j2k/Converter.kt                | 2 +-
 .../org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt   | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/Call.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/Call.java
index 19fd6d5cc34..08b961c2eb9 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/Call.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/Call.java
@@ -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();
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/DelegatingCall.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/DelegatingCall.java
index c1a2b0584a8..033081c9298 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/DelegatingCall.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/DelegatingCall.java
@@ -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();
     }
diff --git a/j2k/src/org/jetbrains/jet/j2k/Converter.kt b/j2k/src/org/jetbrains/jet/j2k/Converter.kt
index d416ceb4b7e..998cd41ee33 100644
--- a/j2k/src/org/jetbrains/jet/j2k/Converter.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/Converter.kt
@@ -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)
diff --git a/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt b/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt
index 0bc515925fe..2d45ab76de6 100644
--- a/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt
@@ -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) {