Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/modules.xml
	platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java

Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f

1 files changed, 19 insertions, 0 deletions

diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/IDEA127275_.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/IDEA127275_.java
new file mode 100644
index 000000000000..c002468c1b91
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/IDEA127275_.java
@@ -0,0 +1,19 @@
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
+
+class Main {
+  {
+    List<Optional<Function<String, String>>> list = asList(of(Main::identity));
+  }
+
+  static <T> List<T> asList(T a) { return null;}
+  static <T> List<T> asList(Optional a) { return null;}
+
+  static <T> Optional<T> of(T value) { return null;}
+
+  public static String identity(final String s) {
+    return s;
+  }
+
+}
\ No newline at end of file