type parameter referenced from static context error (IDEA-104160)

(cherry picked from commit ac98afef2ab67f2b548e6723e63b3b9752bf82f5)

java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java

@@ -964,6 +964,14 @@ public class HighlightVisitorImpl extends JavaElementVisitor implements Highligh
         if (PsiTreeUtil.isAncestor(aClass, place, false) && aClass.hasTypeParameters()) {
           myHolder.add(HighlightClassUtil.checkCreateInnerClassFromStaticContext(ref, place, (PsiClass)resolved));
         }
+      } else if (resolved instanceof PsiTypeParameter) {
+        final PsiTypeParameterListOwner owner = ((PsiTypeParameter)resolved).getOwner();
+        if (owner instanceof PsiClass) {
+          final PsiClass outerClass = (PsiClass)owner;
+          if (!HighlightClassUtil.hasEnclosingInstanceInScope(outerClass, ref, true, false)) {
+            myHolder.add(HighlightClassUtil.reportIllegalEnclosingUsage(ref, aClass, (PsiClass)owner, ref));
+          }
+        }
       }
     }
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA104160.java

@@ -0,0 +1,13 @@
+import java.util.*;
+class Test<T> {
+  public static void foo(<error descr="'Test.this' cannot be referenced from a static context">T</error> t) {}
+  public void bar(T t) {}
+  
+  static class A extends ArrayList<<error descr="'Test.this' cannot be referenced from a static context">T</error>> {
+      static void boo(<error descr="'Test.this' cannot be referenced from a static context">T</error> t){}
+  }
+
+  class B extends ArrayList<T> {
+      void foo(T r){}
+  }
+}

java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java

@@ -220,6 +220,7 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase {
   }
 
   public void testIDEA104100() {doTest(LanguageLevel.JDK_1_7, JavaSdkVersion.JDK_1_7, false);}
+  public void testIDEA104160() {doTest(LanguageLevel.JDK_1_7, JavaSdkVersion.JDK_1_7, false);}
 
   public void testJavaUtilCollections_NoVerify() throws Exception {
     PsiClass collectionsClass = getJavaFacade().findClass("java.util.Collections", GlobalSearchScope.moduleWithLibrariesScope(getModule()));