From 0e28cf15618e775fa831749d742ab67c02e075fe Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Mon, 21 Apr 2014 18:49:33 +0400
Subject: [PATCH] Minor code corrections after review

---
 .../jet/plugin/codeInsight/ShortenReferences.kt     |  9 ++++++---
 .../jet/plugin/completion/smart/LambdaItems.kt      | 13 ++++++-------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt b/idea/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt
index 8a905069cee..7dfd124f59e 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt
@@ -32,7 +32,7 @@ public object ShortenReferences {
     public fun process(file: JetFile, startOffset: Int, endOffset: Int) {
         val smartPointerManager = SmartPointerManager.getInstance(file.getProject())
         val pointer = smartPointerManager.createSmartPsiFileRangePointer(file, TextRange(startOffset, endOffset))
-        try{
+        try {
             process(listOf(file), { element ->
                 val segment = pointer.getRange()
                 if (segment != null) {
@@ -44,7 +44,7 @@ public object ShortenReferences {
                         else -> FilterResult.SKIP
                     }
                 }
-                else{
+                else {
                     FilterResult.SKIP
                 }
             })
@@ -102,9 +102,12 @@ public object ShortenReferences {
         }
 
         override fun visitUserType(userType: JetUserType) {
+            val filterResult = elementFilter(userType)
+            if (filterResult == FilterResult.SKIP) return
+
             userType.getTypeArgumentList()?.accept(this)
 
-            if (elementFilter(userType) == FilterResult.PROCESS && canShortenType(userType)) {
+            if (filterResult == FilterResult.PROCESS && canShortenType(userType)) {
                 typesToShorten.add(userType)
             }
             else{
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/LambdaItems.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/LambdaItems.kt
index f91f63b204e..fbbbb546e06 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/smart/LambdaItems.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/LambdaItems.kt
@@ -59,17 +59,16 @@ class LambdaItems(val project: Project) {
             val offset = context.getStartOffset()
             val placeholder = "{}"
             document.replaceString(offset, context.getTailOffset(), placeholder)
-            editor.getCaretModel().moveToOffset(offset + 1)
             val rangeMarker = document.createRangeMarker(offset, offset + placeholder.length)
 
             // we start template later to not interfere with insertion of tail type
             val commandProcessor = CommandProcessor.getInstance()
             val commandName = commandProcessor.getCurrentCommandName()
             val commandGroupId = commandProcessor.getCurrentCommandGroupId()
-            context.setLaterRunnable{
+            context.setLaterRunnable {
                 commandProcessor.executeCommand(project, {
-                    ApplicationManager.getApplication()!!.runWriteAction(Computable<Unit>{
-                        try{
+                    ApplicationManager.getApplication()!!.runWriteAction(Computable<Unit> {
+                        try {
                             if (rangeMarker.isValid()) {
                                 document.deleteString(rangeMarker.getStartOffset(), rangeMarker.getEndOffset())
                                 editor.getCaretModel().moveToOffset(rangeMarker.getStartOffset())
@@ -101,9 +100,9 @@ class LambdaItems(val project: Project) {
                 template.addTextSegment("(")
             }
 
-            var i = 0
-            for (parameterType in parameterTypes) {
-                if (i++ > 0) {
+            for (i in parameterTypes.indices) {
+                val parameterType = parameterTypes[i]
+                if (i > 0) {
                     template.addTextSegment(", ")
                 }
                 template.addVariable(ParameterNameExpression(JetNameSuggester.suggestNames(parameterType, nameValidator, "p")), true)