From fd4a634001b6d4697737dd8b69990d78e8f18cc9 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Mon, 1 Jun 2015 20:42:48 +0300
Subject: [PATCH] Fixed EA-66835

---
 .../idea/editor/wordSelection/KotlinCodeBlockSelectioner.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinCodeBlockSelectioner.kt b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinCodeBlockSelectioner.kt
index 1e65d1f9380..55dfb7fa363 100644
--- a/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinCodeBlockSelectioner.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinCodeBlockSelectioner.kt
@@ -67,7 +67,7 @@ public class KotlinCodeBlockSelectioner : ExtendWordSelectionHandlerBase() {
                            .dropWhile { it.getElementType() != JetTokens.RBRACE } // search for '}'
                            .drop(1) // skip it
                            .dropWhile { it is PsiWhiteSpace } // and skip all whitespaces
-                           .firstOrNull() ?: blockNode.getLastChildNode()!!
+                           .firstOrNull() ?: blockNode
         return node.getTextRange()!!.getEndOffset()
     }
 }