Merge remote-tracking branch 'origin/master'

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/annotations/clashMethods.java

@@ -3,7 +3,7 @@
     Class <error descr="@interface member clashes with 'annotationType()' in java.lang.annotation.Annotation">annotationType</error>();
     int value();
     boolean equals();
-    <error descr="Invalid type for annotation member">void</error> <error descr="@interface member clashes with 'finalize()' in java.lang.Object">finalize</error>();
-    <error descr="Invalid type for annotation member">void</error> registerNatives();
+    <error descr="Invalid type 'void' for annotation member">void</error> <error descr="@interface member clashes with 'finalize()' in java.lang.Object">finalize</error>();
+    <error descr="Invalid type 'void' for annotation member">void</error> registerNatives();
 }
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/annotations/invalidType.java

@@ -1,8 +1,9 @@
 class Clazz {}
 
 @interface Ann {
-    <error descr="Invalid type for annotation member">Clazz</error> i ();
+    <error descr="Invalid type 'Clazz' for annotation member">Clazz</error> i ();
     <error descr="Cyclic annotation element type">Ann</error> j ();
 
-    <error descr="Invalid type for annotation member">void</error> f(); 
+    <error descr="Invalid type 'void' for annotation member">void</error> f(); 
+    <error descr="Invalid type 'int[][]' for annotation member">int[]</error> intDblArray()[];
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/IncompleteCodeWithMethodReferenceOverLambdaParameter.java

@@ -0,0 +1,12 @@
+
+import java.util.function.Function;
+class Test {
+  {
+    foo(s -> {
+      foo(s::concat);
+      return s;
+    });
+  }
+
+  <S,<error descr="'>' expected."><error descr="Type parameter expected"> </error></error>  void foo(Function<String, String> f){}
+}