From cd2cf2d9878d6367455fc090211a9b360eb9e78d Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Wed, 23 Apr 2014 19:20:23 +0400
Subject: [PATCH] Code completion: minor changes after code review

---
 idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt | 4 ++--
 .../jet/plugin/completion/JetCompletionResultSet.java         | 2 +-
 .../jet/plugin/completion/handlers/GenerateLambda.kt          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt b/idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt
index aa725be2fa3..a68ce038d6a 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt
@@ -57,7 +57,7 @@ class ExpectedInfos(val bindingContext: BindingContext, val moduleDescriptor: Mo
         val callExpression = expressionWithType.getParent() as? JetCallExpression
         if (callExpression != null) {
             val arguments = callExpression.getFunctionLiteralArguments()
-            if (arguments.size > 0 && arguments[0] == expressionWithType) {
+            if (arguments.firstOrNull() == expressionWithType) {
                 return calculateForArgument(callExpression, callExpression.getValueArguments().size, true)
             }
         }
@@ -103,7 +103,7 @@ class ExpectedInfos(val bindingContext: BindingContext, val moduleDescriptor: Mo
             if (isFunctionLiteralArgument) {
                 if (argumentIndex != parameters.size - 1) continue
             }
-            else{
+            else {
                 if (parameters.size <= argumentIndex) continue
             }
             val parameterDescriptor = parameters[argumentIndex]
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionResultSet.java b/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionResultSet.java
index 0d8af56027f..16c2b76e305 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionResultSet.java
+++ b/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionResultSet.java
@@ -100,7 +100,7 @@ public class JetCompletionResultSet {
                         LookupElement lookupElement = DescriptorLookupConverter.createLookupElement(resolveSession, bindingContext, descriptor);
                         addElement(new LookupElementDecorator<LookupElement>(lookupElement) {
                             @Override
-                            public void renderElement(LookupElementPresentation presentation) {
+                            public void renderElement(@NotNull LookupElementPresentation presentation) {
                                 super.renderElement(presentation);
                                 presentation.setItemText(getLookupString() + " " + HandlersPackage.buildLambdaPresentation(parameterType));
                             }
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt b/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt
index 15b20500ef8..6c5eb9cfffc 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt
@@ -75,7 +75,7 @@ private fun needExplicitParameterTypes(context: InsertionContext, placeholderRan
     if (functionTypes.size <= 1) return false
 
     val lambdaParameterCount = KotlinBuiltIns.getInstance().getParameterTypeProjectionsFromFunctionType(lambdaType).size
-    return functionTypes.filter { KotlinBuiltIns.getInstance().getParameterTypeProjectionsFromFunctionType(it).size == lambdaParameterCount}.size > 1
+    return functionTypes.filter { KotlinBuiltIns.getInstance().getParameterTypeProjectionsFromFunctionType(it).size == lambdaParameterCount }.size > 1
 }
 
 private fun buildTemplate(lambdaType: JetType, explicitParameterTypes: Boolean, project: Project): Template {