From 197000b8cea295b3409c4e5979a26496947f5e8c Mon Sep 17 00:00:00 2001
From: Jack Zhou <yz282@cornell.edu>
Date: Mon, 8 Apr 2013 21:33:34 -0400
Subject: [PATCH] Create from usage: Fixed not resolving type parameter
 correctly.

---
 .../jet/plugin/quickfix/CreateMethodFromUsageFix.java       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/CreateMethodFromUsageFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/CreateMethodFromUsageFix.java
index a7f2c42e04f..938992435c3 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/CreateMethodFromUsageFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/CreateMethodFromUsageFix.java
@@ -41,6 +41,7 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.*;
+import org.jetbrains.jet.lang.descriptors.impl.MutableClassDescriptor;
 import org.jetbrains.jet.lang.diagnostics.Diagnostic;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
@@ -552,8 +553,9 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase {
             NamespaceDescriptor namespaceDescriptor = (NamespaceDescriptor) ownerDescriptor;
             return namespaceDescriptor.getMemberScope();
         } else {
-            ClassDescriptor classDescriptor = (ClassDescriptor) ownerDescriptor;
-            return classDescriptor.getMemberScope(classDescriptor.getDefaultType().getArguments());
+            assert ownerDescriptor instanceof MutableClassDescriptor;
+            MutableClassDescriptor classDescriptor = (MutableClassDescriptor) ownerDescriptor;
+            return classDescriptor.getScopeForMemberResolution();
         }
     }