2 files changed, 17 insertions, 5 deletions
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/findUsages/FindUsagesTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/findUsages/FindUsagesTest.groovy
index abc454f356e5..6ee91ef2581f 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/findUsages/FindUsagesTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/findUsages/FindUsagesTest.groovy
@@ -429,7 +429,7 @@ print a<caret>a
   }
 
   void testTraitField() {
-    doTest(6, '''
+    doTest(4, '''
 trait T {
   public int fi<caret>eld = 4
 
@@ -439,16 +439,16 @@ trait T {
   }
 }
 
-class C extends T {
-  def abc {
-    print field
+class C implements T {
+  def abc() {
+    print field         //unresolved
     print T__field
   }
 }
 
 
 new C().T__field
-new C().field
+new C().field             //unresolved
 
 ''')
   }
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInference2_3Test.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInference2_3Test.groovy
index 7382469e50e4..e6882d70258b 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInference2_3Test.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInference2_3Test.groovy
@@ -15,6 +15,7 @@
  */
 package org.jetbrains.plugins.groovy.lang.resolve
 
+import com.intellij.psi.PsiMethod
 import com.intellij.testFramework.LightProjectDescriptor
 import org.jetbrains.plugins.groovy.GroovyLightProjectDescriptor
 
@@ -205,4 +206,15 @@ class Thing {
   }
 
 
+  void testClosureParamsUsingGenerics() {
+   doTest("""\
+    import groovy.transform.CompileStatic
+
+    @CompileStatic
+    class Idea {
+      public static void main(String[] args) {
+        ["bc", "a", ].sort { i<caret>t.size() }
+      }
+    }""", "java.lang.String")
+  }
 }