diff --git a/idea/testData/wordSelection/Statements.1.kt b/idea/testData/wordSelection/Statements.1.kt
new file mode 100644
index 00000000000..08711ceaaab
--- /dev/null
+++ b/idea/testData/wordSelection/Statements.1.kt
@@ -0,0 +1,24 @@
+fun main(args : Array<String>) {
+    for (i in 1..100) {
+        when {
+            i%3 == 0 -> {print("Fizz"); continue;}
+            i%5 == 0 -> {print("Buzz"); continue;}
+
+            (i%3 != 0 && i%5 != 0) -> {print(i); continue;}
+            else -> println()
+        }
+    }
+}
+
+fun foo() : Unit {
+    println() {
+        println()
+
+
+        <selection>pr<caret>intln</selection>()
+        println()
+    }
+
+    println(array(1, 2, 3))
+    println()
+}
\ No newline at end of file
diff --git a/idea/testData/wordSelection/Statements.10.kt b/idea/testData/wordSelection/Statements.10.kt
new file mode 100644
index 00000000000..29dab7c1e26
--- /dev/null
+++ b/idea/testData/wordSelection/Statements.10.kt
@@ -0,0 +1,24 @@
+fun main(args : Array<String>) {
+    for (i in 1..100) {
+        when {
+            i%3 == 0 -> {print("Fizz"); continue;}
+            i%5 == 0 -> {print("Buzz"); continue;}
+
+            (i%3 != 0 && i%5 != 0) -> {print(i); continue;}
+            else -> println()
+        }
+    }
+}
+
+<selection>fun foo() : Unit {
+    println() {
+        println()
+
+
+        pr<caret>intln()
+        println()
+    }
+
+    println(array(1, 2, 3))
+    println()
+}</selection>
\ No newline at end of file
diff --git a/idea/testData/wordSelection/Statements.11.kt b/idea/testData/wordSelection/Statements.11.kt
new file mode 100644
index 00000000000..bfd75290e19
--- /dev/null
+++ b/idea/testData/wordSelection/Statements.11.kt
@@ -0,0 +1,24 @@
+<selection>fun main(args : Array<String>) {
+    for (i in 1..100) {
+        when {
+            i%3 == 0 -> {print("Fizz"); continue;}
+            i%5 == 0 -> {print("Buzz"); continue;}
+
+            (i%3 != 0 && i%5 != 0) -> {print(i); continue;}
+            else -> println()
+        }
+    }
+}
+
+fun foo() : Unit {
+    println() {
+        println()
+
+
+        pr<caret>intln()
+        println()
+    }
+
+    println(array(1, 2, 3))
+    println()
+}</selection>
\ No newline at end of file
diff --git a/idea/testData/wordSelection/Statements.2.kt b/idea/testData/wordSelection/Statements.2.kt
new file mode 100644
index 00000000000..a443c992f6b
--- /dev/null
+++ b/idea/testData/wordSelection/Statements.2.kt
@@ -0,0 +1,24 @@
+fun main(args : Array<String>) {
+    for (i in 1..100) {
+        when {
+            i%3 == 0 -> {print("Fizz"); continue;}
+            i%5 == 0 -> {print("Buzz"); continue;}
+
+            (i%3 != 0 && i%5 != 0) -> {print(i); continue;}
+            else -> println()
+        }
+    }
+}
+
+fun foo() : Unit {
+    println() {
+        println()
+
+
+        <selection>pr<caret>intln()</selection>
+        println()
+    }
+
+    println(array(1, 2, 3))
+    println()
+}
\ No newline at end of file
diff --git a/idea/testData/wordSelection/Statements.3.kt b/idea/testData/wordSelection/Statements.3.kt
new file mode 100644
index 00000000000..d15f26a343e
--- /dev/null
+++ b/idea/testData/wordSelection/Statements.3.kt
@@ -0,0 +1,24 @@
+fun main(args : Array<String>) {
+    for (i in 1..100) {
+        when {
+            i%3 == 0 -> {print("Fizz"); continue;}
+            i%5 == 0 -> {print("Buzz"); continue;}
+
+            (i%3 != 0 && i%5 != 0) -> {print(i); continue;}
+            else -> println()
+        }
+    }
+}
+
+fun foo() : Unit {
+    println() {
+        println()
+
+
+<selection>        pr<caret>intln()
+</selection>        println()
+    }
+
+    println(array(1, 2, 3))
+    println()
+}
\ No newline at end of file
diff --git a/idea/testData/wordSelection/Statements.4.kt b/idea/testData/wordSelection/Statements.4.kt
new file mode 100644
index 00000000000..3318697e3a0
--- /dev/null
+++ b/idea/testData/wordSelection/Statements.4.kt
@@ -0,0 +1,24 @@
+fun main(args : Array<String>) {
+    for (i in 1..100) {
+        when {
+            i%3 == 0 -> {print("Fizz"); continue;}
+            i%5 == 0 -> {print("Buzz"); continue;}
+
+            (i%3 != 0 && i%5 != 0) -> {print(i); continue;}
+            else -> println()
+        }
+    }
+}
+
+fun foo() : Unit {
+    println() {
+        println()
+
+
+<selection>        pr<caret>intln()
+        println()
+</selection>    }
+
+    println(array(1, 2, 3))
+    println()
+}
\ No newline at end of file
diff --git a/idea/testData/wordSelection/Statements.5.kt b/idea/testData/wordSelection/Statements.5.kt
new file mode 100644
index 00000000000..432855942cd
--- /dev/null
+++ b/idea/testData/wordSelection/Statements.5.kt
@@ -0,0 +1,24 @@
+fun main(args : Array<String>) {
+    for (i in 1..100) {
+        when {
+            i%3 == 0 -> {print("Fizz"); continue;}
+            i%5 == 0 -> {print("Buzz"); continue;}
+
+            (i%3 != 0 && i%5 != 0) -> {print(i); continue;}
+            else -> println()
+        }
+    }
+}
+
+fun foo() : Unit {
+    println() {
+<selection>        println()
+
+
+        pr<caret>intln()
+        println()
+</selection>    }
+
+    println(array(1, 2, 3))
+    println()
+}
\ No newline at end of file
diff --git a/idea/testData/wordSelection/Statements.6.kt b/idea/testData/wordSelection/Statements.6.kt
new file mode 100644
index 00000000000..d3128f07ee9
--- /dev/null
+++ b/idea/testData/wordSelection/Statements.6.kt
@@ -0,0 +1,24 @@
+fun main(args : Array<String>) {
+    for (i in 1..100) {
+        when {
+            i%3 == 0 -> {print("Fizz"); continue;}
+            i%5 == 0 -> {print("Buzz"); continue;}
+
+            (i%3 != 0 && i%5 != 0) -> {print(i); continue;}
+            else -> println()
+        }
+    }
+}
+
+fun foo() : Unit {
+    println() <selection>{
+        println()
+
+
+        pr<caret>intln()
+        println()
+    }
+</selection>
+    println(array(1, 2, 3))
+    println()
+}
\ No newline at end of file
diff --git a/idea/testData/wordSelection/Statements.7.kt b/idea/testData/wordSelection/Statements.7.kt
new file mode 100644
index 00000000000..f8d8d794f83
--- /dev/null
+++ b/idea/testData/wordSelection/Statements.7.kt
@@ -0,0 +1,24 @@
+fun main(args : Array<String>) {
+    for (i in 1..100) {
+        when {
+            i%3 == 0 -> {print("Fizz"); continue;}
+            i%5 == 0 -> {print("Buzz"); continue;}
+
+            (i%3 != 0 && i%5 != 0) -> {print(i); continue;}
+            else -> println()
+        }
+    }
+}
+
+fun foo() : Unit {
+<selection>    println() {
+        println()
+
+
+        pr<caret>intln()
+        println()
+    }
+</selection>
+    println(array(1, 2, 3))
+    println()
+}
\ No newline at end of file
diff --git a/idea/testData/wordSelection/Statements.8.kt b/idea/testData/wordSelection/Statements.8.kt
new file mode 100644
index 00000000000..24da15d38ea
--- /dev/null
+++ b/idea/testData/wordSelection/Statements.8.kt
@@ -0,0 +1,24 @@
+fun main(args : Array<String>) {
+    for (i in 1..100) {
+        when {
+            i%3 == 0 -> {print("Fizz"); continue;}
+            i%5 == 0 -> {print("Buzz"); continue;}
+
+            (i%3 != 0 && i%5 != 0) -> {print(i); continue;}
+            else -> println()
+        }
+    }
+}
+
+fun foo() : Unit {
+<selection>    println() {
+        println()
+
+
+        pr<caret>intln()
+        println()
+    }
+
+    println(array(1, 2, 3))
+    println()
+</selection>}
\ No newline at end of file
diff --git a/idea/testData/wordSelection/Statements.9.kt b/idea/testData/wordSelection/Statements.9.kt
new file mode 100644
index 00000000000..0dfa15e2d0b
--- /dev/null
+++ b/idea/testData/wordSelection/Statements.9.kt
@@ -0,0 +1,24 @@
+fun main(args : Array<String>) {
+    for (i in 1..100) {
+        when {
+            i%3 == 0 -> {print("Fizz"); continue;}
+            i%5 == 0 -> {print("Buzz"); continue;}
+
+            (i%3 != 0 && i%5 != 0) -> {print(i); continue;}
+            else -> println()
+        }
+    }
+}
+
+fun foo() : Unit <selection>{
+    println() {
+        println()
+
+
+        pr<caret>intln()
+        println()
+    }
+
+    println(array(1, 2, 3))
+    println()
+}</selection>
\ No newline at end of file
diff --git a/idea/testData/wordSelection/Statements.kt b/idea/testData/wordSelection/Statements.kt
new file mode 100644
index 00000000000..94031204d4e
--- /dev/null
+++ b/idea/testData/wordSelection/Statements.kt
@@ -0,0 +1,24 @@
+fun main(args : Array<String>) {
+    for (i in 1..100) {
+        when {
+            i%3 == 0 -> {print("Fizz"); continue;}
+            i%5 == 0 -> {print("Buzz"); continue;}
+
+            (i%3 != 0 && i%5 != 0) -> {print(i); continue;}
+            else -> println()
+        }
+    }
+}
+
+fun foo() : Unit {
+    println() {
+        println()
+
+
+        pr<caret>intln()
+        println()
+    }
+
+    println(array(1, 2, 3))
+    println()
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/WordSelectionTest.java b/idea/tests/org/jetbrains/jet/WordSelectionTest.java
new file mode 100644
index 00000000000..479f6a77606
--- /dev/null
+++ b/idea/tests/org/jetbrains/jet/WordSelectionTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet;
+
+import com.intellij.testFramework.fixtures.CodeInsightTestUtil;
+import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
+import org.jetbrains.jet.plugin.PluginTestCaseBase;
+
+import java.io.File;
+
+/**
+ * @author Evgeny Gerashchenko
+ * @since 2/24/12
+ */
+public class WordSelectionTest extends LightCodeInsightFixtureTestCase {
+    public void testStatements() {
+        doTest(11);
+    }
+
+    private void doTest(int howMany) {
+        String testName = getTestName(false);
+        String[] afterFiles = new String[howMany];
+        for (int i = 1; i <= howMany; i++) {
+            afterFiles[i - 1] = String.format("%s.%d.kt", testName, i);
+        }
+
+        CodeInsightTestUtil.doWordSelectionTest(myFixture, testName + ".kt", afterFiles);
+    }
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        final String testRelativeDir = "wordSelection";
+        myFixture.setTestDataPath(new File(PluginTestCaseBase.getTestDataPathBase(), testRelativeDir).getPath() +
+                                  File.separator);
+    }
+
+}