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, 30 insertions, 0 deletions

diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/IDEA127124comment.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/IDEA127124comment.java
new file mode 100644
index 000000000000..cb8442e59d12
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/IDEA127124comment.java
@@ -0,0 +1,30 @@
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+class Test {
+  private static class Thing {
+    final String val;
+    public Thing(String val) {
+      this.val = val;
+    }
+  }
+
+  public static Optional<List<String>> highlights() {
+    return Optional.of(Collections.singletonList(new Thing("Hello")))
+      .map(l -> l
+        .stream()
+        .map(t -> t.val + " world!")
+        .collect(Collectors.toList()));
+  }
+
+  public static Optional<List<String>> works() {
+    return Optional.of(Collections.singletonList(new Thing("Hello")))
+      .map(l -> l
+        .stream()
+        .map(t -> t.val + " world!")
+        .collect(Collectors.toList()));
+  }
+}
\ No newline at end of file