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/completion/keywords/instanceofAfterStatementStart.java

@@ -1,5 +1,5 @@
 class Foo {
   void test(Object o) {
-    o <caret>x
+    o <caret>
   }
 }

java/java-tests/testData/codeInsight/completion/normal/SecondMethodParameterName.java

@@ -1,4 +1,4 @@
-public class Eee {
+public class MyFirstTestClassFoo {
 
     void foo(int a, Eee e<caret>){
     }

java/java-tests/testData/codeInsight/completion/normal/SecondMethodParameterName_after.java

@@ -1,4 +1,4 @@
-public class Eee {
+public class MyFirstTestClassFoo {
 
     void foo(int a, Eee eee<caret>){
     }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting13/TextBlocks.java

@@ -1,7 +0,0 @@
-class C {
-  String empty = """
-      """;
-  String invalid1 = <error descr="Illegal text block start: missing new line after opening quotes">""""""</error>;
-  String invalid2 = <error descr="Illegal text block start: missing new line after opening quotes">""" """</error>;
-  String invalid3 = <error descr="Illegal text block start: missing new line after opening quotes">"""\\n """</error>;
-}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting13/UnclosedTextBlock.java

@@ -1,4 +0,0 @@
-class C {
-  String unclosed = """
-      \""";
-}<EOLError descr="Unclosed text block"></EOLError><EOLError descr="'}' expected"></EOLError><EOLError descr="';' expected"></EOLError>

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>;
-        }
-    }
-}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/excessiveLambdaUsage/beforeComputeIfAbsentPossiblyNullable.java

@@ -1,8 +0,0 @@
-// "Use 'putIfAbsent' method without lambda" "false"
-import java.util.Map;
-
-class Test {
-    public void test(Map<String, String> map, String key, String value) {
-        map.computeIfAbsent(key, k <caret>-> value);
-    }
-}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicitArgumentCanBeLambda/afterMapPutIfAbsent.java

@@ -1,6 +1,6 @@
 // "Use 'computeIfAbsent' method with functional argument" "true"
 
-import java.util.*;
+import java.util.Map;
 
 class Test {
   public void test(Map<String, List<Integer>> map, String key) {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicitArgumentCanBeLambda/beforeMapPutIfAbsent.java

@@ -1,6 +1,6 @@
 // "Use 'computeIfAbsent' method with functional argument" "true"
 
-import java.util.*;
+import java.util.Map;
 
 class Test {
   public void test(Map<String, List<Integer>> map, String key) {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicitArgumentCanBeLambda/beforeMapPutIfAbsentPossiblyNullable.java

@@ -1,12 +0,0 @@
-// "Use 'computeIfAbsent' method with functional argument" "false"
-
-import java.util.*;
-
-class Test {
-  public void test(Map<String, List<Integer>> map, String key) {
-    map.putIfAbsent(key, createList<caret>());
-    map.get(key).add(0);
-  }
-
-  private native List<Integer> createList();
-}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicitArgumentCanBeLambda/beforeMapPutIfAbsentUsed.java

@@ -1,6 +1,6 @@
 // "Use 'computeIfAbsent' method with functional argument" "false"
 
-import java.util.*;
+import java.util.Map;
 
 class Test {
   public void test(Map<String, List<Integer>> map, String key) {

java/java-tests/testData/codeInsight/gotoDeclaration/MultipleGenericConstructorsOnIncompleteCall.java

@@ -1,9 +0,0 @@
-import java.lang.String;
-
-class X {
-  <S> X(int i){}
-  <T> X(String s){}
-  {
-    new <caret>X
-  }
-}