Snapshot f5ae6e3be7e12e1ef9e12f48fe3a674266288e4e from master branch of git://git.jetbrains.org/idea/community.git

Change-Id: I756af70fb2910aa2687e94e28338fb9727bce518

10 files changed, 162 insertions, 0 deletions

diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/IDEA78916.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/IDEA78916.java
new file mode 100644
index 000000000000..214a3aec4bd6
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/IDEA78916.java
@@ -0,0 +1,38 @@
+enum EnumPrivateMethodTest {
+    FIRST {
+        @Override
+        public void execute() {
+            this.<error descr="'firstMethod()' has private access in 'EnumPrivateMethodTest'">firstMethod</error>();
+        }
+    };
+
+    public abstract void execute();
+
+    private void firstMethod() {}
+}
+
+abstract class EnumPrivateMethodTest1 {
+    EnumPrivateMethodTest1 FIRST = new EnumPrivateMethodTest1() {
+        @Override
+        public void execute() {
+            this.<error descr="'firstMethod()' has private access in 'EnumPrivateMethodTest1'">firstMethod</error>();
+        }
+    };
+
+    public abstract void execute();
+
+    private void firstMethod() {}
+}
+
+abstract class EnumPrivateMethodTest2 {
+    EnumPrivateMethodTest2 FIRST = new EnumPrivateMethodTest2() {
+        @Override
+        public void execute() {
+            firstMethod();
+        }
+    };
+
+    public abstract void execute();
+
+    private void firstMethod() {}
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA57259.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA57259.java
new file mode 100644
index 000000000000..fbf2bd11bdff
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA57259.java
@@ -0,0 +1,8 @@
+class A<T extends A.B> {
+    class B extends A<B> {}
+}
+
+class C<T> {
+    class D extends C<T> {}
+    <T extends C<String>.D> void foo(){}
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IllegalForwardReferenceInTypeParameterDefinition.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IllegalForwardReferenceInTypeParameterDefinition.java
new file mode 100644
index 000000000000..cbc96adeadc9
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IllegalForwardReferenceInTypeParameterDefinition.java
@@ -0,0 +1,2 @@
+class A<T extends <error descr="Illegal forward reference">S</error>, S> {
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/InheritedWithDifferentArgsInTypeParams.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/InheritedWithDifferentArgsInTypeParams.java
new file mode 100644
index 000000000000..2adff2f8f495
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/InheritedWithDifferentArgsInTypeParams.java
@@ -0,0 +1,24 @@
+interface IA<T> {}
+interface IB<T> extends IA<T> {}
+
+class A {
+    <<error descr="'IA' cannot be inherited with different type arguments: 'java.lang.Integer' and 'java.lang.String'"></error>T extends IA<Integer> & IB<String>> void foo(){}
+}
+
+
+
+interface IA1<T> {}
+interface IB1<T> extends IA1<T> {}
+
+class A1 {
+    <<error descr="'IA1' cannot be inherited with different type arguments: 'java.lang.Object' and 'capture<?>'"></error>T extends IA1<Object> & IB1<?>> void foo(){}
+}
+
+interface IA2<T> {}
+interface IB2<T> extends IA2<T[]> {}
+
+class A2 {
+    <T extends IA2<Object[]> & IB2<?>> void foo(){}
+}
+
+
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/TypeArgumentsOnRawType.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/TypeArgumentsOnRawType.java
new file mode 100644
index 000000000000..bbb565f10f6f
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/TypeArgumentsOnRawType.java
@@ -0,0 +1,43 @@
+interface I{
+    <T extends Iterable<String>> void foo();
+}
+
+abstract class A<S> implements I {
+    public abstract <T extends Iterable<String>> void foo();
+    <T extends A> void bar(T x){
+        A a = null;
+        a.<Iterable<String>> foo();
+        x.<Iterable<String>> foo();
+    }
+}
+
+abstract class B<S> {
+    public abstract <T extends Iterable<String>> void foo();
+    <T extends B> void bar(T x){
+        B a = null;
+        a.<error descr="Type arguments given on a raw method"><Iterable<String>></error> foo();
+        x.<error descr="Type arguments given on a raw method"><Iterable<String>></error> foo();
+    }
+}
+
+abstract class C<S> {
+    public abstract <T extends Iterable<String>> void foo();
+    <T extends C & I> void bar(T x){
+        x.<Iterable<String>> foo();
+    }
+}
+
+//---------------------------------------------------------------
+interface I1 {
+    void foo();
+}
+
+
+abstract class B1<S> {
+    public abstract <T extends Iterable<String>> void foo();
+    <T extends B1 & I1> void bar(T x){
+        B1 a = null;
+        a.<error descr="Type arguments given on a raw method"><Iterable<String>></error> foo();
+        x.<error descr="Type arguments given on a raw method"><Iterable<String>></error> foo();
+    }
+}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/TypeArgumentsOnRawType17.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/TypeArgumentsOnRawType17.java
new file mode 100644
index 000000000000..f586b18a8a1d
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/TypeArgumentsOnRawType17.java
@@ -0,0 +1,43 @@
+interface I{
+    <T extends Iterable<String>> void foo();
+}
+
+abstract class A<S> implements I {
+    public abstract <T extends Iterable<String>> void foo();
+    <T extends A> void bar(T x){
+        A a = null;
+        a.<Iterable<String>> foo();
+        x.<Iterable<String>> foo();
+    }
+}
+
+abstract class B<S> {
+    public abstract <T extends Iterable<String>> void foo();
+    <T extends B> void bar(T x){
+        B a = null;
+        a.<error descr="Type arguments given on a raw method"><Iterable<String>></error> foo();
+        x.<Iterable<String>> foo();
+    }
+}
+
+abstract class C<S> {
+    public abstract <T extends Iterable<String>> void foo();
+    <T extends C & I> void bar(T x){
+        x.<Iterable<String>> foo();
+    }
+}
+
+//---------------------------------------------------------------
+interface I1 {
+    void foo();
+}
+
+
+abstract class B1<S> {
+    public abstract <T extends Iterable<String>> void foo();
+    <T extends B1 & I1> void bar(T x){
+        B1 a = null;
+        a.<error descr="Type arguments given on a raw method"><Iterable<String>></error> foo();
+        x.<Iterable<String>> foo();
+    }
+}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeParameterClass/after1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeParameterClass/after1.java
index 9caf9c84fbad..4b053096d1ae 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeParameterClass/after1.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeParameterClass/after1.java
@@ -5,6 +5,7 @@ class a implements Runnable {
     }
 
     public void run() {
+        <caret>
     }
 }
 
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeParameterClass/after6.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeParameterClass/after6.java
index a0f5015d8ead..06604cb981c3 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeParameterClass/after6.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeParameterClass/after6.java
@@ -5,6 +5,7 @@ class a implements b<String> {
     }
 
     public void g(b<String> t) {
+        <caret>
     }
 }
 interface b<T> {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterAbstractMethod.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterAbstractMethod.java
index 2b5d7f27057c..df358cd3c362 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterAbstractMethod.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterAbstractMethod.java
@@ -6,5 +6,6 @@ abstract class Test {
 class TImple extends Test {
     @Override
     void foo() {
+        <caret>
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterSkipUnresolvedNullable.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterSkipUnresolvedNullable.java
index 94c822617276..2d998570d26c 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterSkipUnresolvedNullable.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterSkipUnresolvedNullable.java
@@ -8,5 +8,6 @@ abstract class Test {
 class TImple extends Test {
     @Override
     public void foo(@Nullable String a) {
+        <caret>
     }
 }
\ No newline at end of file