non-static members access from implicitly static context fixed (IDEA-108285)

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

@@ -835,7 +835,7 @@ public class HighlightClassUtil {
       }
       if (place instanceof PsiModifierListOwner) {
         final PsiModifierList modifierList = ((PsiModifierListOwner)place).getModifierList();
-        if (modifierList != null && modifierList.hasExplicitModifier(PsiModifier.STATIC)) {
+        if (modifierList != null && modifierList.hasModifierProperty(PsiModifier.STATIC)) {
           return false;
         }
       }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/ThisInInterface.java

@@ -3,12 +3,12 @@ class C implements A {
 }
 
 interface A {
-    A a = new C(<error descr="Cannot find symbol variable this">this</error>);
+    A a = new C(<error descr="'A.this' cannot be referenced from a static context">this</error>);
     A a1 = new C(<error descr="Cannot find symbol variable this">this</error>){};
 
     class B  {
         A foo() {
-            return <error descr="Cannot find symbol variable this">A.this</error>;
+            return <error descr="'A.this' cannot be referenced from a static context">A.this</error>;
         }
 
         B foo1() {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting6/IDEA108285.java

@@ -0,0 +1,5 @@
+class Test<T> {
+        interface NestedInterface<U extends <error descr="'Test.this' cannot be referenced from a static context">T</error>> {
+                <V extends <error descr="'Test.this' cannot be referenced from a static context">T</error>> void foo();
+        }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/interfaceMethods/ThisAccessibility.java

@@ -1,5 +1,5 @@
 interface Bazz {
-    Bazz foo = <error descr="Cannot find symbol variable this">Bazz.this</error>;
+    Bazz foo = <error descr="'Bazz.this' cannot be referenced from a static context">Bazz.this</error>;
     static void foo1() {
         Bazz foo = <error descr="'Bazz.this' cannot be referenced from a static context">Bazz.this</error>;
     }
@@ -7,7 +7,7 @@ interface Bazz {
     Runnable bar = new Runnable() {
        @Override
        public void run() {
-           Bazz f = <error descr="Cannot find symbol variable this">Bazz.this</error>;
+           Bazz f = <error descr="'Bazz.this' cannot be referenced from a static context">Bazz.this</error>;
        }
     };
   

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

@@ -55,4 +55,5 @@ public class LightAdvHighlightingJdk6Test extends LightDaemonAnalyzerTestCase {
   public void testJavacQuirks() { setLanguageLevel(LanguageLevel.JDK_1_6); doTest(true, false); }
   public void testMethodReturnTypeSubstitutability() { setLanguageLevel(LanguageLevel.JDK_1_6); doTest(true, false); }
   public void testIDEADEV11877() throws Exception { setLanguageLevel(LanguageLevel.JDK_1_6); doTest(false, false); }
+  public void testIDEA108285() throws Exception { setLanguageLevel(LanguageLevel.JDK_1_6); doTest(false, false); }
 }