From 19aa35ffeb1fbc4369280efd4146f3478b30b407 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Tue, 22 Apr 2014 14:15:07 +0400
Subject: [PATCH] Smart completion: minor changes

---
 .../plugin/completion/smart/StaticMembers.kt  |  2 +-
 .../jet/plugin/completion/smart/Utils.kt      | 48 +++++++++----------
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt
index 89109794e3d..bf473e7da22 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt
@@ -62,7 +62,7 @@ class StaticMembers(val bindingContext: BindingContext, val resolveSession: Reso
             else if (DescriptorUtils.isEnumEntry(descriptor)) {
                 classifier = { ExpectedInfoClassification.MATCHES } /* we do not need to check type of enum entry because it's taken from proper enum */
             }
-            else{
+            else {
                 return
             }
 
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt
index 40d3dabf5c2..92e54f76610 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt
@@ -96,38 +96,34 @@ fun MutableCollection<LookupElement>.addLookupElements(expectedInfos: Collection
 }
 
 fun MutableCollection<LookupElement>.addLookupElementsForNullable(factory: () -> LookupElement?, matchedInfos: Collection<ExpectedInfo>) {
-    run {
-        var lookupElement = factory()
-        if (lookupElement != null) {
-            lookupElement = object: LookupElementDecorator<LookupElement>(lookupElement!!) {
-                override fun renderElement(presentation: LookupElementPresentation) {
-                    super.renderElement(presentation)
-                    presentation.setItemText("!! " + presentation.getItemText())
-                }
-                override fun handleInsert(context: InsertionContext) {
-                    WithTailStringInsertHandler("!!").handleInsert(context, getDelegate())
-                }
+    var lookupElement = factory()
+    if (lookupElement != null) {
+        lookupElement = object: LookupElementDecorator<LookupElement>(lookupElement!!) {
+            override fun renderElement(presentation: LookupElementPresentation) {
+                super.renderElement(presentation)
+                presentation.setItemText("!! " + presentation.getItemText())
+            }
+            override fun handleInsert(context: InsertionContext) {
+                WithTailStringInsertHandler("!!").handleInsert(context, getDelegate())
             }
-            lookupElement = lookupElement!!.suppressAutoInsertion()
-            add(lookupElement!!.addTail(matchedInfos))
         }
+        lookupElement = lookupElement!!.suppressAutoInsertion()
+        add(lookupElement!!.addTail(matchedInfos))
     }
 
-    run {
-        var lookupElement = factory()
-        if (lookupElement != null) {
-            lookupElement = object: LookupElementDecorator<LookupElement>(lookupElement!!) {
-                override fun renderElement(presentation: LookupElementPresentation) {
-                    super.renderElement(presentation)
-                    presentation.setItemText("?: " + presentation.getItemText())
-                }
-                override fun handleInsert(context: InsertionContext) {
-                    WithTailStringInsertHandler(" ?: ").handleInsert(context, getDelegate()) //TODO: code style
-                }
+    lookupElement = factory()
+    if (lookupElement != null) {
+        lookupElement = object: LookupElementDecorator<LookupElement>(lookupElement!!) {
+            override fun renderElement(presentation: LookupElementPresentation) {
+                super.renderElement(presentation)
+                presentation.setItemText("?: " + presentation.getItemText())
+            }
+            override fun handleInsert(context: InsertionContext) {
+                WithTailStringInsertHandler(" ?: ").handleInsert(context, getDelegate()) //TODO: code style
             }
-            lookupElement = lookupElement!!.suppressAutoInsertion()
-            add(lookupElement!!.addTail(matchedInfos))
         }
+        lookupElement = lookupElement!!.suppressAutoInsertion()
+        add(lookupElement!!.addTail(matchedInfos))
     }
 }