Completion: no "else" in first when entry

idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/KeywordValues.kt

@@ -34,7 +34,8 @@ object KeywordValues {
         if (whenCondition != null) {
             val entry = whenCondition.getParent() as JetWhenEntry
             val whenExpression = entry.getParent() as JetWhenExpression
-            if (whenExpression.getElseExpression() == null && entry == whenExpression.getEntries().last) {
+            val entries = whenExpression.getEntries()
+            if (whenExpression.getElseExpression() == null && entry == entries.last() && entries.size() != 1) {
                 val lookupElement = LookupElementBuilder.create("else").bold().withTailText(" ->")
                 collection.add(object: LookupElementDecorator<LookupElement>(lookupElement) {
                     override fun handleInsert(context: InsertionContext) {

idea/testData/completion/handlers/smart/WhenElse.kt

@@ -1,5 +1,6 @@
 fun foo(s: String) {
     when(s) {
+        "" -> return
         <caret>
     }
 }

idea/testData/completion/handlers/smart/WhenElse.kt.after

@@ -1,5 +1,6 @@
 fun foo(s: String) {
     when(s) {
+        "" -> return
         else -> <caret>
     }
 }

idea/testData/completion/smart/whenEntry/1.kt

@@ -13,4 +13,4 @@ fun foo(e: E) {
 // EXIST: { lookupString:"A", itemText:"E.A" }
 // EXIST: { lookupString:"B", itemText:"E.B" }
 // EXIST: { lookupString:"C", itemText:"E.C" }
-// EXIST: {"lookupString":"else","tailText":" ->","itemText":"else"}
+// ABSENT: else

idea/testData/completion/smart/whenEntry/2.kt

@@ -13,4 +13,4 @@ fun foo(e: E) {
 // ABSENT: A
 // EXIST: { lookupString:"B", itemText:"E.B" }
 // EXIST: { lookupString:"C", itemText:"E.C" }
-// ABSENT:else
+// ABSENT: else

idea/testData/completion/smart/whenEntry/WhenWithNoSubject1.kt

@@ -8,4 +8,4 @@ fun foo(b1: Boolean, b2: Boolean) {
 // EXIST: b2
 // ABSENT: true
 // ABSENT: false
-// EXIST: {"lookupString":"else","tailText":" ->","itemText":"else"}
+// ABSENT: else