Merge remote-tracking branch 'origin/master'

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addOnDemandStaticImport/beforeIncompleteReference.java

@@ -0,0 +1,6 @@
+// "Add on demand static import for 'test.Foo'" "false"
+class Foo {
+  {
+    final Stri<caret>ng. s = toString();
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/after5.java

@@ -4,8 +4,8 @@ abstract class Test {
 
   void foo() {
       Class<?> i = getObject().getClass();
-      if (i.equals(RuntimeException.class)) {
-      } else if (i.equals(IOException.class)) {
+      if (RuntimeException.class.equals(i)) {
+      } else if (IOException.class.equals(i)) {
       }
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterNotCompletesNormally.java

@@ -0,0 +1,14 @@
+// "Replace 'switch' with 'if'" "true"
+class X {
+
+  void m(String s, int a) throws IOException {
+      if ("a".equals(s)) {
+          a();
+      } else {
+          d();
+      }
+  }
+
+  void a() throws IOException { }
+  void d() throws IOException { }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterNotCompletesNormally2.java

@@ -0,0 +1,17 @@
+// "Replace 'switch' with 'if'" "true"
+class X {
+  void test4() throws IOException {
+    String variable = "abc";
+      if ("abc".equals(variable)) {
+          String s1 = "abcd";
+      } else if ("def".equals(variable)) {
+          String s1 = "abcd";
+          myFunction(s1);
+      } else {
+          throw new IllegalArgumentException();
+      }
+  }
+
+  public void myFunction(Object o1) throws IOException {
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterString.java

@@ -0,0 +1,9 @@
+// "Replace 'switch' with 'if'" "true"
+class X {
+  public void doSomething( String value) {
+      if ("case1".equals(value)) {
+      } else if ("case2".equals(value)) {
+      } else {
+      }
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeNotCompletesNormally.java

@@ -0,0 +1,18 @@
+// "Replace 'switch' with 'if'" "true"
+class X {
+
+  void m(String s, int a) throws IOException {
+    switch<caret> (s) {
+      case "a": {
+        a();
+        break;
+      }
+      default: {
+        d();
+      }
+    }
+  }
+
+  void a() throws IOException { }
+  void d() throws IOException { }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeNotCompletesNormally2.java

@@ -0,0 +1,22 @@
+// "Replace 'switch' with 'if'" "true"
+class X {
+  void test4() throws IOException {
+    String variable = "abc";
+    <caret>switch (variable) {
+      case "abc": {
+        String s1 = "abcd";
+        break;
+      }
+      case "def": {
+        String s1 = "abcd";
+        myFunction(s1);
+        break;
+      }
+      default:
+        throw new IllegalArgumentException();
+    }
+  }
+
+  public void myFunction(Object o1) throws IOException {
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeString.java

@@ -0,0 +1,13 @@
+// "Replace 'switch' with 'if'" "true"
+class X {
+  public void doSomething( String value) {
+    switch<caret> ( value ) {
+      case "case1":
+        break;
+      case "case2":
+        break;
+      default:
+        break;
+    }
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/after7.java

@@ -5,7 +5,6 @@ class C {
         if (s instanceof String) {
             String s1 = (String) s;
             <caret>
-
         }
     }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/afterBrokenCode.java

@@ -0,0 +1,10 @@
+// "Insert '(String)o' declaration" "true"
+class X {
+    void foo(Object o) {
+        if (o instanceof String) {
+            String o1 = (String) o;
+            <caret>
+            String substring = o.();
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/afterFormatting.java

@@ -5,8 +5,7 @@ class C {
   void f(Object o) {
     if (o instanceof IOException) {
         IOException o1 = (IOException) o;
-        
-
+        <caret>
     }
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/afterInsertInEmptyLine.java

@@ -0,0 +1,13 @@
+// "Insert '(String)o' declaration" "true"
+class X {
+    void foo(Object o) {
+        if (o instanceof String) {
+            String a;
+            String b;
+            String o1 = (String) o;
+            <caret>
+
+            String c;
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/afterIntersection.java

@@ -4,7 +4,6 @@ class C {
         if (o instanceof String && f == null) {
             String o1 = (String) o;
             <caret>
-
         }
     }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/afterLineEndComment.java

@@ -2,7 +2,6 @@
 class C {
     void f(Object o, Object f) {
         if (o instanceof String) {//todo comment
-
             String o1 = (String) o;
             
         }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/beforeBrokenCode.java

@@ -0,0 +1,8 @@
+// "Insert '(String)o' declaration" "true"
+class X {
+    void foo(Object o) {
+        if (o insta<caret>nceof String) {
+            String substring = o.();
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/beforeInsertInEmptyLine.java

@@ -0,0 +1,12 @@
+// "Insert '(String)o' declaration" "true"
+class X {
+    void foo(Object o) {
+        if (o insta<caret>nceof String) {
+            String a;
+            String b;
+
+
+            String c;
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/insertNew/beforeInvalidCode.java

@@ -0,0 +1,9 @@
+// "Insert new" "false"
+class a {
+ void f() { 
+   if (Runtime<caret>Exception() {
+        
+   }
+ }
+}
+

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/optionalIsPresent/afterConsumerField.java

@@ -1,4 +1,4 @@
-// "Replace Optional.isPresent() condition with functional style expression" "true"
+// "Replace Optional.isPresent() condition with functional style expression" "GENERIC_ERROR_OR_WARNING"
 
 import java.util.*;
 
@@ -6,6 +6,6 @@ public class Main {
   String myString;
 
   public void testOptional(Optional<String> str) {
-      str.ifPresent(s -> myString = s);
+      str.ifPresent(s -> myString = s.isEmpty() ? null : s);
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/optionalIsPresent/beforeConsumerField.java

@@ -1,4 +1,4 @@
-// "Replace Optional.isPresent() condition with functional style expression" "true"
+// "Replace Optional.isPresent() condition with functional style expression" "GENERIC_ERROR_OR_WARNING"
 
 import java.util.*;
 
@@ -7,7 +7,7 @@ public class Main {
 
   public void testOptional(Optional<String> str) {
     if (str.isPrese<caret>nt()) {
-      myString = str.get();
+      myString = str.get().isEmpty() ? null : str.get();
     }
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceWithTernaryOperator/afterTernary.java

@@ -0,0 +1,8 @@
+// "Replace with '(b ? null : "foo") != null ?:'" "true"
+class A {
+  void bar(String s) {}
+
+  void foo(boolean b){
+    bar((b ? null : "foo") != null ? b ? null : "foo" : null);
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceWithTernaryOperator/beforeTernary.java

@@ -0,0 +1,8 @@
+// "Replace with '(b ? null : "foo") != null ?:'" "true"
+class A {
+  void bar(String s) {}
+
+  void foo(boolean b){
+    bar(b ? null<caret> : "foo");
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/surroundWithIf/afterTernary.java

@@ -0,0 +1,10 @@
+// "Surround with 'if ((b ? null : "foo") != null)'" "true"
+class A {
+    void bar(String s) {}
+
+    void foo(boolean b){
+        if ((b ? null : "foo") != null) {
+            bar(b ? null : "foo");
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/surroundWithIf/beforeSideEffect.java

@@ -0,0 +1,8 @@
+// "Surround with 'if ((Math.random() > 0.5 ? null : "foo") != null)'" "false"
+class A {
+    void bar(String s) {}
+
+    void foo(boolean b){
+        bar(Math.random() > 0.5 ? null<caret> : "foo");
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/surroundWithIf/beforeTernary.java

@@ -0,0 +1,8 @@
+// "Surround with 'if ((b ? null : "foo") != null)'" "true"
+class A {
+    void bar(String s) {}
+
+    void foo(boolean b){
+        bar(b ? null<caret> : "foo");
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/surroundWithRequireNonNull/afterArrayAccess.java

@@ -0,0 +1,10 @@
+// "Replace with 'Objects.requireNonNull(arr)'" "true"
+
+import java.util.Objects;
+
+class MyClass {
+  void test() {
+    int[] arr = Math.random() > 0.5 ? null : new int[10];
+    System.out.println(Objects.requireNonNull(arr)[1]);
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/surroundWithRequireNonNull/afterFieldDereference.java

@@ -0,0 +1,14 @@
+// "Replace with 'Objects.requireNonNull(getObject())'" "true"
+
+import java.util.Objects;
+
+class MyClass {
+  int a;
+
+  static MyClass getObject() {
+    return Math.random() > 0.5 ? new MyClass() : null;
+  }
+  void test() {
+    Objects.requireNonNull(getObject()).a = 5;
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/surroundWithRequireNonNull/afterMethodArgument.java

@@ -0,0 +1,12 @@
+// "Replace with 'Objects.requireNonNull(arr)'" "true"
+
+import java.util.Objects;
+
+class MyClass {
+  void foo(String[] arr) {}
+
+  void test() {
+    String[] arr = Math.random() > 0.5 ? null : new String[10];
+    foo(Objects.requireNonNull(arr));
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/surroundWithRequireNonNull/afterMethodArgument2.java

@@ -0,0 +1,12 @@
+// "Replace with 'Objects.requireNonNull(Math.random() > 0.5 ? null : "bar")'" "true"
+
+import java.util.List;
+import java.util.Objects;
+
+class MyClass {
+  void foo(String str) {}
+
+  void test() {
+    foo(Objects.requireNonNull(Math.random() > 0.5 ? null : "bar"));
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/surroundWithRequireNonNull/afterMethodCall.java

@@ -0,0 +1,11 @@
+// "Replace with 'Objects.requireNonNull(s1)'" "true"
+import java.util.List;
+import java.util.Objects;
+
+class MyClass {
+  void test(List<String> list) {
+    list.stream().map(s -> s.isEmpty() ? null : s)
+      .map(s1 -> Objects.requireNonNull(s1).trim())
+      .forEach(System.out::println);
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/surroundWithRequireNonNull/beforeArrayAccess.java

@@ -0,0 +1,8 @@
+// "Replace with 'Objects.requireNonNull(arr)'" "true"
+
+class MyClass {
+  void test() {
+    int[] arr = Math.random() > 0.5 ? null : new int[10];
+    System.out.println(arr<caret>[1]);
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/surroundWithRequireNonNull/beforeFieldDereference.java

@@ -0,0 +1,12 @@
+// "Replace with 'Objects.requireNonNull(getObject())'" "true"
+
+class MyClass {
+  int a;
+
+  static MyClass getObject() {
+    return Math.random() > 0.5 ? new MyClass() : null;
+  }
+  void test() {
+    getObject<caret>().a = 5;
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/surroundWithRequireNonNull/beforeMethodArgument.java

@@ -0,0 +1,10 @@
+// "Replace with 'Objects.requireNonNull(arr)'" "true"
+
+class MyClass {
+  void foo(String[] arr) {}
+
+  void test() {
+    String[] arr = Math.random() > 0.5 ? null : new String[10];
+    foo(ar<caret>r);
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/surroundWithRequireNonNull/beforeMethodArgument2.java

@@ -0,0 +1,11 @@
+// "Replace with 'Objects.requireNonNull(Math.random() > 0.5 ? null : "bar")'" "true"
+
+import java.util.List;
+
+class MyClass {
+  void foo(String str) {}
+
+  void test() {
+    foo(Math.random() > 0.5 ? null :<caret> "bar");
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/surroundWithRequireNonNull/beforeMethodCall.java

@@ -0,0 +1,10 @@
+// "Replace with 'Objects.requireNonNull(s1)'" "true"
+import java.util.List;
+
+class MyClass {
+  void test(List<String> list) {
+    list.stream().map(s -> s.isEmpty() ? null : s)
+      .map(s1 -> s1.t<caret>rim())
+      .forEach(System.out::println);
+  }
+}