Create from usage: Added tests.

idea/src/org/jetbrains/jet/plugin/quickfix/CreateMethodFromUsageFix.java

@@ -563,7 +563,7 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase {
         ownerType.computeTypeCandidates(currentFileContext);
         TypeCandidate[] ownerTypeCandidates = ownerType.getTypeCandidates();
         assert ownerTypeCandidates.length > 0;
-        if (ownerTypeCandidates.length == 1) {
+        if (ownerTypeCandidates.length == 1 || ApplicationManager.getApplication().isUnitTestMode()) {
             selectedReceiverType = ownerTypeCandidates[0];
             doInvoke(project);
         } else {

idea/testData/quickfix/createFromUsage/classObject/afterCreateClassObject1.kt

@@ -0,0 +1,10 @@
+// "Create class object from usage" "true"
+// ERROR: Expression 'T' of type '<class-object-for-T>' cannot be invoked as a function
+trait T {
+    class object {
+    }
+
+}
+fun foo() {
+    val x = T()
+}

idea/testData/quickfix/createFromUsage/classObject/afterCreateClassObject2.kt

@@ -0,0 +1,10 @@
+// "Create class object from usage" "true"
+// ERROR: Expression 'T' of type '<class-object-for-T>' cannot be invoked as a function
+trait T
+{
+    class object {
+    }
+}
+fun foo() {
+    val x = T()
+}

idea/testData/quickfix/createFromUsage/classObject/beforeCreateClassObject1.kt

@@ -0,0 +1,8 @@
+// "Create class object from usage" "true"
+// ERROR: Expression 'T' of type '<class-object-for-T>' cannot be invoked as a function
+trait T {
+
+}
+fun foo() {
+    val x = T<caret>()
+}

idea/testData/quickfix/createFromUsage/classObject/beforeCreateClassObject2.kt

@@ -0,0 +1,6 @@
+// "Create class object from usage" "true"
+// ERROR: Expression 'T' of type '<class-object-for-T>' cannot be invoked as a function
+trait T
+fun foo() {
+    val x = T<caret>()
+}

idea/testData/quickfix/createFromUsage/component/afterCreateComponentFromUsage1.kt

@@ -0,0 +1,11 @@
+// "Create method 'component3' from usage" "true"
+class Foo<T> {
+    fun component1(): Int { return 0 }
+    fun component2(): Int { return 0 }
+    fun component3(): Any {
+        throw Exception("not implemented") //To change body of created methods use File | Settings | File Templates.
+    }
+}
+fun foo() {
+    val (a, b, c) = Foo<Int>()
+}

idea/testData/quickfix/createFromUsage/component/afterCreateComponentFromUsage2.kt

@@ -0,0 +1,11 @@
+// "Create method 'component3' from usage" "true"
+class Foo<T> {
+    fun component1(): Int { return 0 }
+    fun component2(): Int { return 0 }
+    fun component3(): String {
+        throw Exception("not implemented") //To change body of created methods use File | Settings | File Templates.
+    }
+}
+fun foo() {
+    val (a, b, c: String) = Foo<Int>()
+}

idea/testData/quickfix/createFromUsage/component/beforeCreateComponentFromUsage1.kt

@@ -0,0 +1,8 @@
+// "Create method 'component3' from usage" "true"
+class Foo<T> {
+    fun component1(): Int { return 0 }
+    fun component2(): Int { return 0 }
+}
+fun foo() {
+    val (a, b, c) = Foo<caret><Int>()
+}

idea/testData/quickfix/createFromUsage/component/beforeCreateComponentFromUsage2.kt

@@ -0,0 +1,8 @@
+// "Create method 'component3' from usage" "true"
+class Foo<T> {
+    fun component1(): Int { return 0 }
+    fun component2(): Int { return 0 }
+}
+fun foo() {
+    val (a, b, c: String) = Foo<caret><Int>()
+}

idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage1.kt

@@ -0,0 +1,9 @@
+// "Create method 'get' from usage" "true"
+class Foo<T> {
+    fun x (y: Foo<Iterable<T>>) {
+        val z: Iterable<T> = y[""]
+    }
+    fun get(s: String): T {
+        throw Exception("not implemented") //To change body of created methods use File | Settings | File Templates.
+    }
+}

idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage10.kt

@@ -0,0 +1,9 @@
+// "Create method 'get' from usage" "true"
+class Foo<T> {
+    fun <T> x (y: Foo<List<T>>, w: java.util.ArrayList<T>) {
+        val z: Iterable<T> = y["", w]
+    }
+    fun get(s: String, w: T): T {
+        throw Exception("not implemented") //To change body of created methods use File | Settings | File Templates.
+    }
+}

idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage11.kt

@@ -0,0 +1,9 @@
+// "Create method 'get' from usage" "true"
+class Foo<T> {
+    fun get(s: String, w: T): T {
+        throw Exception("not implemented") //To change body of created methods use File | Settings | File Templates.
+    }
+}
+fun <T> x (y: Foo<List<T>>, w: java.util.ArrayList<T>) {
+    val z: Iterable<T> = y["", w]
+}

idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage12.kt

@@ -0,0 +1,9 @@
+// "Create method 'get' from usage" "true"
+class Foo<T> {
+    fun get(s: String, w: T): Any {
+        throw Exception("not implemented") //To change body of created methods use File | Settings | File Templates.
+    }
+}
+fun <T> x (y: Foo<List<T>>, w: java.util.ArrayList<T>) {
+    val z = y["", w]
+}

idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage13.kt

@@ -0,0 +1,13 @@
+// "Create method 'get' from usage" "true"
+import java.util.ArrayList
+
+class Foo<T> {
+    fun bar(arg: String) { }
+    fun <T, V> x (y: Foo<List<T>>, w: ArrayList<V>) {
+        val z = y["", w]
+        bar(z)
+    }
+    fun <V> get(s: String, w: ArrayList<V>): String {
+        throw Exception("not implemented") //To change body of created methods use File | Settings | File Templates.
+    }
+}

idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage2.kt

@@ -0,0 +1,7 @@
+// "Create method 'get' from usage" "true"
+fun x (y: Any) {
+    val z: Any = y[""]
+}
+fun Any.get(s: String): Any {
+    throw Exception("not implemented") //To change body of created methods use File | Settings | File Templates.
+}

idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage3.kt

@@ -0,0 +1,9 @@
+// "Create method 'get' from usage" "true"
+class Foo<T> {
+    fun <S> x (y: Foo<Iterable<S>>) {
+        val z: Iterable<S> = y[""]
+    }
+    fun get(s: String): T {
+        throw Exception("not implemented") //To change body of created methods use File | Settings | File Templates.
+    }
+}

idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage4.kt

@@ -0,0 +1,9 @@
+// "Create method 'get' from usage" "true"
+class Foo<T, S: Iterable<T>> {
+    fun <U> x (y: Foo<U, Iterable<U>>) {
+        val z: U = y[""]
+    }
+    fun get(s: String): T {
+        throw Exception("not implemented") //To change body of created methods use File | Settings | File Templates.
+    }
+}

idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage5.kt

@@ -0,0 +1,9 @@
+// "Create method 'get' from usage" "true"
+class Foo<T> {
+    fun <T, V> x (y: Foo<Iterable<T>>, w: Iterable<V>) {
+        val z: Iterable<T> = y["", w]
+    }
+    fun <V> get(s: String, w: Iterable<V>): T {
+        throw Exception("not implemented") //To change body of created methods use File | Settings | File Templates.
+    }
+}

idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage6.kt

@@ -0,0 +1,11 @@
+// "Create method 'get' from usage" "true"
+import java.util.ArrayList
+
+class Foo<T> {
+    fun <T, V> x (y: java.util.ArrayList<T>, w: java.util.ArrayList<V>) {
+        val z: java.util.ArrayList<T>? = if (y["", w]) null else null
+    }
+}
+fun <E, V> ArrayList<E>.get(s: String, w: ArrayList<V>): Boolean {
+    throw Exception("not implemented") //To change body of created methods use File | Settings | File Templates.
+}

idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage7.kt

@@ -0,0 +1,11 @@
+// "Create method 'get' from usage" "true"
+import java.util.ArrayList
+
+class Foo<T> {
+    fun <T, V> x (y: Foo<List<T>>, w: ArrayList<V>) {
+        val z: Iterable<T> = y["", w]
+    }
+    fun <V> get(s: String, w: ArrayList<V>): T {
+        throw Exception("not implemented") //To change body of created methods use File | Settings | File Templates.
+    }
+}

idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage8.kt

@@ -0,0 +1,11 @@
+// "Create method 'get' from usage" "true"
+import java.util.ArrayList
+
+class Foo<T> {
+    fun x (y: Foo<List<T>>, w: ArrayList<T>) {
+        val z: Iterable<T> = y["", w]
+    }
+    fun get(s: String, w: T): T {
+        throw Exception("not implemented") //To change body of created methods use File | Settings | File Templates.
+    }
+}

idea/testData/quickfix/createFromUsage/get/afterCreateGetFromUsage9.kt

@@ -0,0 +1,11 @@
+// "Create method 'get' from usage" "true"
+import java.util.ArrayList
+
+class Foo<S> {
+    fun <T> x (y: Foo<List<T>>, w: ArrayList<T>) {
+        val z: Iterable<T> = y["", w]
+    }
+    fun get(s: String, w: S): S {
+        throw Exception("not implemented") //To change body of created methods use File | Settings | File Templates.
+    }
+}

idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage1.kt

@@ -0,0 +1,6 @@
+// "Create method 'get' from usage" "true"
+class Foo<T> {
+    fun x (y: Foo<Iterable<T>>) {
+        val z: Iterable<T> = y<caret>[""]
+    }
+}

idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage10.kt

@@ -0,0 +1,6 @@
+// "Create method 'get' from usage" "true"
+class Foo<T> {
+    fun <T> x (y: Foo<List<T>>, w: java.util.ArrayList<T>) {
+        val z: Iterable<T> = y<caret>["", w]
+    }
+}

idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage11.kt

@@ -0,0 +1,5 @@
+// "Create method 'get' from usage" "true"
+class Foo<T>
+fun <T> x (y: Foo<List<T>>, w: java.util.ArrayList<T>) {
+    val z: Iterable<T> = y<caret>["", w]
+}

idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage12.kt

@@ -0,0 +1,5 @@
+// "Create method 'get' from usage" "true"
+class Foo<T>
+fun <T> x (y: Foo<List<T>>, w: java.util.ArrayList<T>) {
+    val z = y<caret>["", w]
+}

idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage13.kt

@@ -0,0 +1,10 @@
+// "Create method 'get' from usage" "true"
+import java.util.ArrayList
+
+class Foo<T> {
+    fun bar(arg: String) { }
+    fun <T, V> x (y: Foo<List<T>>, w: ArrayList<V>) {
+        val z = y<caret>["", w]
+        bar(z)
+    }
+}

idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage2.kt

@@ -0,0 +1,4 @@
+// "Create method 'get' from usage" "true"
+fun x (y: Any) {
+    val z: Any = y<caret>[""]
+}

idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage3.kt

@@ -0,0 +1,6 @@
+// "Create method 'get' from usage" "true"
+class Foo<T> {
+    fun <S> x (y: Foo<Iterable<S>>) {
+        val z: Iterable<S> = y<caret>[""]
+    }
+}

idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage4.kt

@@ -0,0 +1,6 @@
+// "Create method 'get' from usage" "true"
+class Foo<T, S: Iterable<T>> {
+    fun <U> x (y: Foo<U, Iterable<U>>) {
+        val z: U = y<caret>[""]
+    }
+}

idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage5.kt

@@ -0,0 +1,6 @@
+// "Create method 'get' from usage" "true"
+class Foo<T> {
+    fun <T, V> x (y: Foo<Iterable<T>>, w: Iterable<V>) {
+        val z: Iterable<T> = y<caret>["", w]
+    }
+}

idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage6.kt

@@ -0,0 +1,6 @@
+// "Create method 'get' from usage" "true"
+class Foo<T> {
+    fun <T, V> x (y: java.util.ArrayList<T>, w: java.util.ArrayList<V>) {
+        val z: java.util.ArrayList<T>? = if (y<caret>["", w]) null else null
+    }
+}

idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage7.kt

@@ -0,0 +1,8 @@
+// "Create method 'get' from usage" "true"
+import java.util.ArrayList
+
+class Foo<T> {
+    fun <T, V> x (y: Foo<List<T>>, w: ArrayList<V>) {
+        val z: Iterable<T> = y<caret>["", w]
+    }
+}

idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage8.kt

@@ -0,0 +1,8 @@
+// "Create method 'get' from usage" "true"
+import java.util.ArrayList
+
+class Foo<T> {
+    fun x (y: Foo<List<T>>, w: ArrayList<T>) {
+        val z: Iterable<T> = y<caret>["", w]
+    }
+}

idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage9.kt

@@ -0,0 +1,8 @@
+// "Create method 'get' from usage" "true"
+import java.util.ArrayList
+
+class Foo<S> {
+    fun <T> x (y: Foo<List<T>>, w: ArrayList<T>) {
+        val z: Iterable<T> = y<caret>["", w]
+    }
+}

idea/testData/quickfix/createFromUsage/hasNext/afterCreateHasNextFromUsage1.kt

@@ -0,0 +1,17 @@
+// "Create method 'hasNext' from usage" "true"
+class FooIterator<T> {
+    fun next(): Int {
+        throw Exception("not implemented")
+    }
+    fun hasNext(): Boolean {
+        throw Exception("not implemented") //To change body of created methods use File | Settings | File Templates.
+    }
+}
+class Foo<T> {
+    fun iterator(): FooIterator<String> {
+        throw Exception("not implemented")
+    }
+}
+fun foo() {
+    for (i: Int in Foo<Int>()) { }
+}

idea/testData/quickfix/createFromUsage/hasNext/afterCreateHasNextFromUsage2.kt

@@ -0,0 +1,17 @@
+// "Create method 'hasNext' from usage" "true"
+class FooIterator<T> {
+    fun next(): T {
+        throw Exception("not implemented")
+    }
+    fun hasNext(): Boolean {
+        throw Exception("not implemented") //To change body of created methods use File | Settings | File Templates.
+    }
+}
+class Foo<T> {
+    fun iterator(): FooIterator<T> {
+        throw Exception("not implemented")
+    }
+}
+fun foo() {
+    for (i in Foo<Int>()) { }
+}

idea/testData/quickfix/createFromUsage/hasNext/beforeCreateHasNextFromUsage1.kt

@@ -0,0 +1,14 @@
+// "Create method 'hasNext' from usage" "true"
+class FooIterator<T> {
+    fun next(): Int {
+        throw Exception("not implemented")
+    }
+}
+class Foo<T> {
+    fun iterator(): FooIterator<String> {
+        throw Exception("not implemented")
+    }
+}
+fun foo() {
+    for (i: Int in Foo<caret><Int>()) { }
+}

idea/testData/quickfix/createFromUsage/hasNext/beforeCreateHasNextFromUsage2.kt

@@ -0,0 +1,14 @@
+// "Create method 'hasNext' from usage" "true"
+class FooIterator<T> {
+    fun next(): T {
+        throw Exception("not implemented")
+    }
+}
+class Foo<T> {
+    fun iterator(): FooIterator<T> {
+        throw Exception("not implemented")
+    }
+}
+fun foo() {
+    for (i in Foo<caret><Int>()) { }
+}

idea/testData/quickfix/createFromUsage/iterator/afterCreateIteratorFromUsage1.kt

@@ -0,0 +1,9 @@
+// "Create method 'iterator' from usage" "true"
+class Foo<T> {
+    fun iterator(): Iterator<T> {
+        throw Exception("not implemented") //To change body of created methods use File | Settings | File Templates.
+    }
+}
+fun foo() {
+    for (i: Int in Foo<Int>()) { }
+}

idea/testData/quickfix/createFromUsage/iterator/afterCreateIteratorFromUsage2.kt

@@ -0,0 +1,12 @@
+// "Create method 'iterator' from usage" "true"
+class Foo<T> {
+    fun iterator(): Iterator<String> {
+        throw Exception("not implemented") //To change body of created methods use File | Settings | File Templates.
+    }
+}
+fun foo() {
+    for (i in Foo<Int>()) {
+        bar(i)
+    }
+}
+fun bar(i: String) { }

idea/testData/quickfix/createFromUsage/iterator/beforeCreateIteratorFromUsage1.kt

@@ -0,0 +1,5 @@
+// "Create method 'iterator' from usage" "true"
+class Foo<T>
+fun foo() {
+    for (i: Int in Foo<caret><Int>()) { }
+}

idea/testData/quickfix/createFromUsage/iterator/beforeCreateIteratorFromUsage2.kt

@@ -0,0 +1,8 @@
+// "Create method 'iterator' from usage" "true"
+class Foo<T>
+fun foo() {
+    for (i in Foo<caret><Int>()) {
+        bar(i)
+    }
+}
+fun bar(i: String) { }

idea/testData/quickfix/createFromUsage/next/afterCreateNextFromUsage1.kt

@@ -0,0 +1,15 @@
+// "Create method 'next' from usage" "true"
+class FooIterator<T> {
+    fun hasNext(): Boolean { return false }
+    fun next(): Int {
+        throw Exception("not implemented") //To change body of created methods use File | Settings | File Templates.
+    }
+}
+class Foo<T> {
+    fun iterator(): FooIterator<String> {
+        throw Exception("not implemented")
+    }
+}
+fun foo() {
+    for (i: Int in Foo<Int>()) { }
+}

idea/testData/quickfix/createFromUsage/next/afterCreateNextFromUsage2.kt

@@ -0,0 +1,15 @@
+// "Create method 'next' from usage" "true"
+class FooIterator<T> {
+    fun hasNext(): Boolean { return false }
+    fun next(): T {
+        throw Exception("not implemented") //To change body of created methods use File | Settings | File Templates.
+    }
+}
+class Foo<T> {
+    fun iterator(): FooIterator<T> {
+        throw Exception("not implemented")
+    }
+}
+fun foo() {
+    for (i: Int in Foo<Int>()) { }
+}

idea/testData/quickfix/createFromUsage/next/beforeCreateNextFromUsage1.kt

@@ -0,0 +1,12 @@
+// "Create method 'next' from usage" "true"
+class FooIterator<T> {
+    fun hasNext(): Boolean { return false }
+}
+class Foo<T> {
+    fun iterator(): FooIterator<String> {
+        throw Exception("not implemented")
+    }
+}
+fun foo() {
+    for (i: Int in Foo<caret><Int>()) { }
+}

idea/testData/quickfix/createFromUsage/next/beforeCreateNextFromUsage2.kt

@@ -0,0 +1,12 @@
+// "Create method 'next' from usage" "true"
+class FooIterator<T> {
+    fun hasNext(): Boolean { return false }
+}
+class Foo<T> {
+    fun iterator(): FooIterator<T> {
+        throw Exception("not implemented")
+    }
+}
+fun foo() {
+    for (i: Int in Foo<caret><Int>()) { }
+}

idea/testData/quickfix/createFromUsage/set/afterCreateSetFromUsage1.kt

@@ -0,0 +1,9 @@
+// "Create method 'set' from usage" "true"
+class Foo<T> {
+    fun <T> x (y: Foo<List<T>>, w: java.util.ArrayList<T>) {
+        y["", w] = w
+    }
+    fun set(s: String, w: T, value: T) {
+        throw Exception("not implemented") //To change body of created methods use File | Settings | File Templates.
+    }
+}

idea/testData/quickfix/createFromUsage/set/afterCreateSetFromUsage2.kt

@@ -0,0 +1,11 @@
+// "Create method 'set' from usage" "true"
+import java.util.ArrayList
+
+class Foo<T> {
+    fun <T> x (y: Any, w: java.util.ArrayList<T>) {
+        y["", w] = w
+    }
+}
+fun <T> Any.set(s: String, w: ArrayList<T>, value: ArrayList<T>) {
+    throw Exception("not implemented") //To change body of created methods use File | Settings | File Templates.
+}

idea/testData/quickfix/createFromUsage/set/beforeCreateSetFromUsage1.kt

@@ -0,0 +1,6 @@
+// "Create method 'set' from usage" "true"
+class Foo<T> {
+    fun <T> x (y: Foo<List<T>>, w: java.util.ArrayList<T>) {
+        y<caret>["", w] = w
+    }
+}

idea/testData/quickfix/createFromUsage/set/beforeCreateSetFromUsage2.kt

@@ -0,0 +1,6 @@
+// "Create method 'set' from usage" "true"
+class Foo<T> {
+    fun <T> x (y: Any, w: java.util.ArrayList<T>) {
+        y<caret>["", w] = w
+    }
+}

idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixMultiFileTestGenerated.java

@@ -31,7 +31,7 @@ import org.jetbrains.jet.plugin.quickfix.AbstractQuickFixMultiFileTest;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/quickfix")
-@InnerTestClasses({QuickFixMultiFileTestGenerated.AddStarProjections.class, QuickFixMultiFileTestGenerated.AutoImports.class, QuickFixMultiFileTestGenerated.Modifiers.class, QuickFixMultiFileTestGenerated.Nullables.class, QuickFixMultiFileTestGenerated.Override.class, QuickFixMultiFileTestGenerated.TypeImports.class, QuickFixMultiFileTestGenerated.TypeMismatch.class, QuickFixMultiFileTestGenerated.Variables.class})
+@InnerTestClasses({QuickFixMultiFileTestGenerated.AddStarProjections.class, QuickFixMultiFileTestGenerated.AutoImports.class, QuickFixMultiFileTestGenerated.CreateFromUsage.class, QuickFixMultiFileTestGenerated.Modifiers.class, QuickFixMultiFileTestGenerated.Nullables.class, QuickFixMultiFileTestGenerated.Override.class, QuickFixMultiFileTestGenerated.TypeImports.class, QuickFixMultiFileTestGenerated.TypeMismatch.class, QuickFixMultiFileTestGenerated.Variables.class})
 public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTest {
     public void testAllFilesPresentInQuickfix() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/quickfix"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true);
@@ -129,6 +129,20 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
         
     }
     
+    @TestMetadata("idea/testData/quickfix/createFromUsage")
+    @InnerTestClasses({})
+    public static class CreateFromUsage extends AbstractQuickFixMultiFileTest {
+        public void testAllFilesPresentInCreateFromUsage() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/quickfix/createFromUsage"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true);
+        }
+        
+        public static Test innerSuite() {
+            TestSuite suite = new TestSuite("CreateFromUsage");
+            suite.addTestSuite(CreateFromUsage.class);
+            return suite;
+        }
+    }
+    
     @TestMetadata("idea/testData/quickfix/modifiers")
     @InnerTestClasses({Modifiers.AddOpenToClassDeclaration.class})
     public static class Modifiers extends AbstractQuickFixMultiFileTest {
@@ -281,6 +295,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
         suite.addTestSuite(QuickFixMultiFileTestGenerated.class);
         suite.addTest(AddStarProjections.innerSuite());
         suite.addTestSuite(AutoImports.class);
+        suite.addTest(CreateFromUsage.innerSuite());
         suite.addTest(Modifiers.innerSuite());
         suite.addTest(Nullables.innerSuite());
         suite.addTest(Override.innerSuite());

idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java

@@ -16,19 +16,22 @@
 
 package org.jetbrains.jet.plugin.quickfix;
 
+import junit.framework.Assert;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+
+import java.io.File;
+import java.util.regex.Pattern;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
 
-import java.io.File;
+import org.jetbrains.jet.plugin.quickfix.AbstractQuickFixTest;
-import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/quickfix")
-@InnerTestClasses({QuickFixTestGenerated.Abstract.class, QuickFixTestGenerated.AddStarProjections.class, QuickFixTestGenerated.AutoImports.class, QuickFixTestGenerated.ChangeSignature.class, QuickFixTestGenerated.CheckArguments.class, QuickFixTestGenerated.Expressions.class, QuickFixTestGenerated.Migration.class, QuickFixTestGenerated.Modifiers.class, QuickFixTestGenerated.Nullables.class, QuickFixTestGenerated.Override.class, QuickFixTestGenerated.PlatformClasses.class, QuickFixTestGenerated.Supercalls.class, QuickFixTestGenerated.SupertypeInitialization.class, QuickFixTestGenerated.TypeAddition.class, QuickFixTestGenerated.TypeImports.class, QuickFixTestGenerated.TypeMismatch.class, QuickFixTestGenerated.TypeProjection.class, QuickFixTestGenerated.UselessImports.class, QuickFixTestGenerated.Variables.class, QuickFixTestGenerated.When.class})
+@InnerTestClasses({QuickFixTestGenerated.Abstract.class, QuickFixTestGenerated.AddStarProjections.class, QuickFixTestGenerated.AutoImports.class, QuickFixTestGenerated.ChangeSignature.class, QuickFixTestGenerated.CheckArguments.class, QuickFixTestGenerated.CreateFromUsage.class, QuickFixTestGenerated.Expressions.class, QuickFixTestGenerated.Migration.class, QuickFixTestGenerated.Modifiers.class, QuickFixTestGenerated.Nullables.class, QuickFixTestGenerated.Override.class, QuickFixTestGenerated.PlatformClasses.class, QuickFixTestGenerated.Supercalls.class, QuickFixTestGenerated.SupertypeInitialization.class, QuickFixTestGenerated.TypeAddition.class, QuickFixTestGenerated.TypeImports.class, QuickFixTestGenerated.TypeMismatch.class, QuickFixTestGenerated.TypeProjection.class, QuickFixTestGenerated.UselessImports.class, QuickFixTestGenerated.Variables.class, QuickFixTestGenerated.When.class})
 public class QuickFixTestGenerated extends AbstractQuickFixTest {
     public void testAllFilesPresentInQuickfix() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/quickfix"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -426,6 +429,208 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
     }
     
+    @TestMetadata("idea/testData/quickfix/createFromUsage")
+    @InnerTestClasses({CreateFromUsage.ClassObject.class, CreateFromUsage.Component.class, CreateFromUsage.Get.class, CreateFromUsage.HasNext.class, CreateFromUsage.Iterator.class, CreateFromUsage.Next.class, CreateFromUsage.Set.class})
+    public static class CreateFromUsage extends AbstractQuickFixTest {
+        public void testAllFilesPresentInCreateFromUsage() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/quickfix/createFromUsage"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+        }
+        
+        @TestMetadata("idea/testData/quickfix/createFromUsage/classObject")
+        public static class ClassObject extends AbstractQuickFixTest {
+            public void testAllFilesPresentInClassObject() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/quickfix/createFromUsage/classObject"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            }
+            
+            @TestMetadata("beforeCreateClassObject1.kt")
+            public void testCreateClassObject1() throws Exception {
+                doTest("idea/testData/quickfix/createFromUsage/classObject/beforeCreateClassObject1.kt");
+            }
+            
+            @TestMetadata("beforeCreateClassObject2.kt")
+            public void testCreateClassObject2() throws Exception {
+                doTest("idea/testData/quickfix/createFromUsage/classObject/beforeCreateClassObject2.kt");
+            }
+            
+        }
+        
+        @TestMetadata("idea/testData/quickfix/createFromUsage/component")
+        public static class Component extends AbstractQuickFixTest {
+            public void testAllFilesPresentInComponent() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/quickfix/createFromUsage/component"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            }
+            
+            @TestMetadata("beforeCreateComponentFromUsage1.kt")
+            public void testCreateComponentFromUsage1() throws Exception {
+                doTest("idea/testData/quickfix/createFromUsage/component/beforeCreateComponentFromUsage1.kt");
+            }
+            
+            @TestMetadata("beforeCreateComponentFromUsage2.kt")
+            public void testCreateComponentFromUsage2() throws Exception {
+                doTest("idea/testData/quickfix/createFromUsage/component/beforeCreateComponentFromUsage2.kt");
+            }
+            
+        }
+        
+        @TestMetadata("idea/testData/quickfix/createFromUsage/get")
+        public static class Get extends AbstractQuickFixTest {
+            public void testAllFilesPresentInGet() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/quickfix/createFromUsage/get"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            }
+            
+            @TestMetadata("beforeCreateGetFromUsage1.kt")
+            public void testCreateGetFromUsage1() throws Exception {
+                doTest("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage1.kt");
+            }
+            
+            @TestMetadata("beforeCreateGetFromUsage10.kt")
+            public void testCreateGetFromUsage10() throws Exception {
+                doTest("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage10.kt");
+            }
+            
+            @TestMetadata("beforeCreateGetFromUsage11.kt")
+            public void testCreateGetFromUsage11() throws Exception {
+                doTest("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage11.kt");
+            }
+            
+            @TestMetadata("beforeCreateGetFromUsage12.kt")
+            public void testCreateGetFromUsage12() throws Exception {
+                doTest("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage12.kt");
+            }
+            
+            @TestMetadata("beforeCreateGetFromUsage13.kt")
+            public void testCreateGetFromUsage13() throws Exception {
+                doTest("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage13.kt");
+            }
+            
+            @TestMetadata("beforeCreateGetFromUsage2.kt")
+            public void testCreateGetFromUsage2() throws Exception {
+                doTest("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage2.kt");
+            }
+            
+            @TestMetadata("beforeCreateGetFromUsage3.kt")
+            public void testCreateGetFromUsage3() throws Exception {
+                doTest("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage3.kt");
+            }
+            
+            @TestMetadata("beforeCreateGetFromUsage4.kt")
+            public void testCreateGetFromUsage4() throws Exception {
+                doTest("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage4.kt");
+            }
+            
+            @TestMetadata("beforeCreateGetFromUsage5.kt")
+            public void testCreateGetFromUsage5() throws Exception {
+                doTest("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage5.kt");
+            }
+            
+            @TestMetadata("beforeCreateGetFromUsage6.kt")
+            public void testCreateGetFromUsage6() throws Exception {
+                doTest("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage6.kt");
+            }
+            
+            @TestMetadata("beforeCreateGetFromUsage7.kt")
+            public void testCreateGetFromUsage7() throws Exception {
+                doTest("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage7.kt");
+            }
+            
+            @TestMetadata("beforeCreateGetFromUsage8.kt")
+            public void testCreateGetFromUsage8() throws Exception {
+                doTest("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage8.kt");
+            }
+            
+            @TestMetadata("beforeCreateGetFromUsage9.kt")
+            public void testCreateGetFromUsage9() throws Exception {
+                doTest("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage9.kt");
+            }
+            
+        }
+        
+        @TestMetadata("idea/testData/quickfix/createFromUsage/hasNext")
+        public static class HasNext extends AbstractQuickFixTest {
+            public void testAllFilesPresentInHasNext() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/quickfix/createFromUsage/hasNext"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            }
+            
+            @TestMetadata("beforeCreateHasNextFromUsage1.kt")
+            public void testCreateHasNextFromUsage1() throws Exception {
+                doTest("idea/testData/quickfix/createFromUsage/hasNext/beforeCreateHasNextFromUsage1.kt");
+            }
+            
+            @TestMetadata("beforeCreateHasNextFromUsage2.kt")
+            public void testCreateHasNextFromUsage2() throws Exception {
+                doTest("idea/testData/quickfix/createFromUsage/hasNext/beforeCreateHasNextFromUsage2.kt");
+            }
+            
+        }
+        
+        @TestMetadata("idea/testData/quickfix/createFromUsage/iterator")
+        public static class Iterator extends AbstractQuickFixTest {
+            public void testAllFilesPresentInIterator() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/quickfix/createFromUsage/iterator"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            }
+            
+            @TestMetadata("beforeCreateIteratorFromUsage1.kt")
+            public void testCreateIteratorFromUsage1() throws Exception {
+                doTest("idea/testData/quickfix/createFromUsage/iterator/beforeCreateIteratorFromUsage1.kt");
+            }
+            
+            @TestMetadata("beforeCreateIteratorFromUsage2.kt")
+            public void testCreateIteratorFromUsage2() throws Exception {
+                doTest("idea/testData/quickfix/createFromUsage/iterator/beforeCreateIteratorFromUsage2.kt");
+            }
+            
+        }
+        
+        @TestMetadata("idea/testData/quickfix/createFromUsage/next")
+        public static class Next extends AbstractQuickFixTest {
+            public void testAllFilesPresentInNext() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/quickfix/createFromUsage/next"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            }
+            
+            @TestMetadata("beforeCreateNextFromUsage1.kt")
+            public void testCreateNextFromUsage1() throws Exception {
+                doTest("idea/testData/quickfix/createFromUsage/next/beforeCreateNextFromUsage1.kt");
+            }
+            
+            @TestMetadata("beforeCreateNextFromUsage2.kt")
+            public void testCreateNextFromUsage2() throws Exception {
+                doTest("idea/testData/quickfix/createFromUsage/next/beforeCreateNextFromUsage2.kt");
+            }
+            
+        }
+        
+        @TestMetadata("idea/testData/quickfix/createFromUsage/set")
+        public static class Set extends AbstractQuickFixTest {
+            public void testAllFilesPresentInSet() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/quickfix/createFromUsage/set"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            }
+            
+            @TestMetadata("beforeCreateSetFromUsage1.kt")
+            public void testCreateSetFromUsage1() throws Exception {
+                doTest("idea/testData/quickfix/createFromUsage/set/beforeCreateSetFromUsage1.kt");
+            }
+            
+            @TestMetadata("beforeCreateSetFromUsage2.kt")
+            public void testCreateSetFromUsage2() throws Exception {
+                doTest("idea/testData/quickfix/createFromUsage/set/beforeCreateSetFromUsage2.kt");
+            }
+            
+        }
+        
+        public static Test innerSuite() {
+            TestSuite suite = new TestSuite("CreateFromUsage");
+            suite.addTestSuite(CreateFromUsage.class);
+            suite.addTestSuite(ClassObject.class);
+            suite.addTestSuite(Component.class);
+            suite.addTestSuite(Get.class);
+            suite.addTestSuite(HasNext.class);
+            suite.addTestSuite(Iterator.class);
+            suite.addTestSuite(Next.class);
+            suite.addTestSuite(Set.class);
+            return suite;
+        }
+    }
+    
     @TestMetadata("idea/testData/quickfix/expressions")
     public static class Expressions extends AbstractQuickFixTest {
         public void testAllFilesPresentInExpressions() throws Exception {
@@ -1501,6 +1706,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         suite.addTestSuite(AutoImports.class);
         suite.addTestSuite(ChangeSignature.class);
         suite.addTestSuite(CheckArguments.class);
+        suite.addTest(CreateFromUsage.innerSuite());
         suite.addTestSuite(Expressions.class);
         suite.addTestSuite(Migration.class);
         suite.addTest(Modifiers.innerSuite());