Merge remote-tracking branch 'origin/master' into eldar/cidr-debugger

# Conflicts:
#	CIDR/clion/src/com/jetbrains/cidr/cpp/toolchains/MSVC.java

GitOrigin-RevId: f3593b526d1870f32b3f1451cab0c6a653e5beb5

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

@@ -1,27 +0,0 @@
-
-import java.util.function.Function;
-
-
-class MyTest {
-    {
-        Function<B, Try<A>> aNew = Try::new;
-        Try<B> bTry = new Try<>(new B());
-        Try<A> aTry = bTry.flatMap(Try::new);
-    }
-
-    private static class A { }
-
-    private static class B extends A { }
-
-    private static class Try<T> {
-        public Try(T t) {
-        }
-        public Try(Exception e) {
-        }
-
-        public <U> Try<U> flatMap(Function<? super T, Try<U>> mapper) {
-            return null;
-        }
-    }
-
-}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/PreferMethodInsideSameComb.java

@@ -1,11 +0,0 @@
-interface ToStringBug {
-
-    static void toString(String s) {}
-
-    class Inner implements ToStringBug {
-       
-        {
-           toString<error descr="'toString()' in 'java.lang.Object' cannot be applied to '(java.lang.String)'">( "x")</error>;
-        }
-    }
-}