[java] More tests for preview; minor fixes

GitOrigin-RevId: 7f72c5f68ab821e728eb0d5152f0910f48035046

java/java-analysis-impl/src/com/intellij/codeInspection/RemoveAnnotationQuickFix.java

@@ -4,12 +4,15 @@ package com.intellij.codeInspection;
 import com.intellij.codeInsight.AnnotationUtil;
 import com.intellij.codeInsight.ExternalAnnotationsManager;
 import com.intellij.codeInsight.FileModificationService;
+import com.intellij.codeInsight.intention.preview.IntentionPreviewInfo;
 import com.intellij.codeInspection.nullable.AnnotateOverriddenMethodParameterFix;
 import com.intellij.java.analysis.JavaAnalysisBundle;
 import com.intellij.openapi.application.WriteAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.JavaCodeStyleManager;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.util.ObjectUtils;
 import com.intellij.util.containers.ContainerUtil;
 import one.util.streamex.StreamEx;
 import org.jetbrains.annotations.NotNull;
@@ -47,6 +50,18 @@ public class RemoveAnnotationQuickFix implements LocalQuickFix {
     return false;
   }
 
+  @Override
+  public @NotNull IntentionPreviewInfo generatePreview(@NotNull Project project, @NotNull ProblemDescriptor previewDescriptor) {
+    PsiJavaFile file = ObjectUtils.tryCast(previewDescriptor.getStartElement().getContainingFile(), PsiJavaFile.class);
+    if (file == null) return IntentionPreviewInfo.DIFF;
+    PsiAnnotation annotation = myAnnotation.getElement();
+    if (annotation == null || annotation.getContainingFile() != file.getOriginalFile()) return IntentionPreviewInfo.EMPTY;
+    PsiAnnotation copy = PsiTreeUtil.findSameElementInCopy(annotation, file);
+    copy.delete();
+    JavaCodeStyleManager.getInstance(project).removeRedundantImports(file);
+    return IntentionPreviewInfo.DIFF;
+  }
+
   @Override
   public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
     PsiAnnotation annotation = myAnnotation.getElement();

java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodBodyFix.java

@@ -52,12 +52,6 @@ public final class AddMethodBodyFix implements IntentionActionWithFixAllOption {
            BaseIntentionAction.canModify(myMethod);
   }
 
-  @NotNull
-  @Override
-  public PsiElement getElementToMakeWritable(@NotNull PsiFile file) {
-    return myMethod;
-  }
-
   @Override
   public void invoke(@NotNull Project project, Editor editor, PsiFile file) {
     PsiUtil.setModifierProperty(myMethod, PsiModifier.ABSTRACT, false);

java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddRuntimeExceptionToThrowsAction.java

@@ -17,7 +17,7 @@ public class AddRuntimeExceptionToThrowsAction implements IntentionAction {
 
   @Override
   public boolean startInWriteAction() {
-    return false;
+    return true;
   }
 
   @Override
@@ -28,14 +28,15 @@ public class AddRuntimeExceptionToThrowsAction implements IntentionAction {
 
   @Override
   public void invoke(@NotNull final Project project, Editor editor, PsiFile file) {
-    if (!FileModificationService.getInstance().prepareFileForWrite(file)) return;
-
-    PsiDocumentManager.getInstance(project).commitAllDocuments();
-
     PsiClassType aClass = getRuntimeExceptionAtCaret(editor, file);
     PsiMethod method = PsiTreeUtil.getParentOfType(elementAtCaret(editor, file), PsiMethod.class);
-
-    AddExceptionToThrowsFix.addExceptionsToThrowsList(project, method, Collections.singleton(aClass));
+    if (method != null) {
+      if (method.isPhysical()) {
+        AddExceptionToThrowsFix.addExceptionsToThrowsList(project, method, Collections.singleton(aClass));
+      } else {
+        AddExceptionToThrowsFix.processMethod(project, method, Collections.singleton(aClass));
+      }
+    }
   }
 
 

java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AnnotationMethodReturnTypeFix.java

@@ -36,4 +36,15 @@ public class AnnotationMethodReturnTypeFix extends MethodReturnTypeFix {
       });
     }
   }
+
+  @Override
+  protected void updateMethodType(@NotNull PsiMethod method, @NotNull PsiType type) {
+    super.updateMethodType(method, type);
+    if (!myFromDefaultValue && method instanceof PsiAnnotationMethod) {
+      PsiAnnotationMemberValue value = ((PsiAnnotationMethod)method).getDefaultValue();
+      if (value != null) {
+        new CommentTracker().deleteAndRestoreComments(value);
+      }
+    }
+  }
 }

java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodReturnTypeFix.java

@@ -455,11 +455,8 @@ public class MethodReturnTypeFix extends LocalQuickFixAndIntentionActionOnPsiEle
     PsiFile containingFile = method.getContainingFile();
     if (containingFile == file.getOriginalFile()) {
       PsiMethod methodCopy = PsiTreeUtil.findSameElementInCopy(method, file);
-      PsiTypeElement typeElement = methodCopy.getReturnTypeElement();
-      if (typeElement != null) {
-        typeElement.replace(PsiElementFactory.getInstance(project).createTypeElement(type));
-        return IntentionPreviewInfo.DIFF;
-      }
+      updateMethodType(methodCopy, type);
+      return IntentionPreviewInfo.DIFF;
     }
     PsiModifierList modifiers = method.getModifierList();
     String modifiersText = StreamEx.of(PsiModifier.MODIFIERS).filter(modifiers::hasExplicitModifier).map(mod -> mod + " ").joining();
@@ -474,4 +471,11 @@ public class MethodReturnTypeFix extends LocalQuickFixAndIntentionActionOnPsiEle
     String newText = modifiersText + newTypeText + name + "(" + parameters + ")";
     return new IntentionPreviewInfo.CustomDiff(JavaFileType.INSTANCE, containingFile.getName(), origText, newText);
   }
+
+  protected void updateMethodType(@NotNull PsiMethod method, @NotNull PsiType type) {
+    PsiTypeElement typeElement = method.getReturnTypeElement();
+    if (typeElement != null) {
+      typeElement.replace(PsiElementFactory.getInstance(method.getProject()).createTypeElement(type));
+    }
+  }
 }

java/java-impl/src/com/intellij/codeInsight/intention/impl/AddSingleMemberStaticImportAction.java

@@ -125,12 +125,12 @@ public class AddSingleMemberStaticImportAction extends BaseElementAtCaretIntenti
   }
 
   private static PsiImportStatementBase findExistingImport(PsiFile file, PsiClass aClass, String refName) {
-    if (file instanceof PsiJavaFile) {
+    if (file instanceof PsiJavaFile && aClass != null) {
       PsiImportList importList = ((PsiJavaFile)file).getImportList();
       if (importList != null) {
         for (PsiImportStaticStatement staticStatement : importList.getImportStaticStatements()) {
           if (staticStatement.isOnDemand()) {
-            if (staticStatement.resolveTargetClass() == aClass) {
+            if (aClass.isEquivalentTo(staticStatement.resolveTargetClass())) {
               return staticStatement;
             }
           }
@@ -138,7 +138,7 @@ public class AddSingleMemberStaticImportAction extends BaseElementAtCaretIntenti
 
         final PsiImportStatementBase importStatement = importList.findSingleImportStatement(refName);
         if (importStatement instanceof PsiImportStaticStatement &&
-            ((PsiImportStaticStatement)importStatement).resolveTargetClass() == aClass) {
+            aClass.isEquivalentTo(((PsiImportStaticStatement)importStatement).resolveTargetClass())) {
           return importStatement;
         }
       }
@@ -272,7 +272,7 @@ public class AddSingleMemberStaticImportAction extends BaseElementAtCaretIntenti
                   catch (IncorrectOperationException e) {
                     LOG.error(e);
                   }
-                  if (!Comparing.equal(reference.resolve(), referent)) {
+                  if (referent == null ? reference.resolve() != null : !referent.isEquivalentTo(reference.resolve())) {
                     reference = rebind(reference, resolvedClass);
                   }
                 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAnnotationAttributeName/afterMatchingArrayItem.java

@@ -1,4 +1,4 @@
-// "Add 'type='" "true"
+// "Add 'type='" "true-preview"
 class T {
   @interface A {
     String[] type();

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAnnotationAttributeName/afterMatchingType.java

@@ -1,4 +1,4 @@
-// "Add 'name='" "true"
+// "Add 'name='" "true-preview"
 class T {
   @interface A {
     int size();

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAnnotationAttributeName/afterMultiAttr.java

@@ -1,4 +1,4 @@
-// "Add 'type='" "true"
+// "Add 'type='" "true-preview"
 class T {
   @interface A {
     String name();

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAnnotationAttributeName/beforeMatchingArrayItem.java

@@ -1,4 +1,4 @@
-// "Add 'type='" "true"
+// "Add 'type='" "true-preview"
 class T {
   @interface A {
     String[] type();

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAnnotationAttributeName/beforeMatchingType.java

@@ -1,4 +1,4 @@
-// "Add 'name='" "true"
+// "Add 'name='" "true-preview"
 class T {
   @interface A {
     int size();

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAnnotationAttributeName/beforeMultiAttr.java

@@ -1,4 +1,4 @@
-// "Add 'type='" "true"
+// "Add 'type='" "true-preview"
 class T {
   @interface A {
     String name();

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAnnotationTarget/afterEmptyArray1.java

@@ -1,4 +1,4 @@
-// "Make annotation applicable to fields" "true"
+// "Make annotation applicable to fields" "true-preview"
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAnnotationTarget/afterEmptyArray2.java

@@ -1,4 +1,4 @@
-// "Make annotation applicable to fields" "true"
+// "Make annotation applicable to fields" "true-preview"
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAnnotationTarget/afterNotArray.java

@@ -1,4 +1,4 @@
-// "Make annotation applicable to fields" "true"
+// "Make annotation applicable to fields" "true-preview"
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAnnotationTarget/afterNotEmptyArray.java

@@ -1,4 +1,4 @@
-// "Make annotation applicable to fields" "true"
+// "Make annotation applicable to fields" "true-preview"
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAnnotationTarget/afterTargetIsMissing.java

@@ -1,4 +1,4 @@
-// "Make annotation applicable to type uses" "true"
+// "Make annotation applicable to type uses" "true-preview"
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 import java.util.List;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAnnotationTarget/beforeEmptyArray1.java

@@ -1,4 +1,4 @@
-// "Make annotation applicable to fields" "true"
+// "Make annotation applicable to fields" "true-preview"
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAnnotationTarget/beforeEmptyArray2.java

@@ -1,4 +1,4 @@
-// "Make annotation applicable to fields" "true"
+// "Make annotation applicable to fields" "true-preview"
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAnnotationTarget/beforeNotArray.java

@@ -1,4 +1,4 @@
-// "Make annotation applicable to fields" "true"
+// "Make annotation applicable to fields" "true-preview"
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAnnotationTarget/beforeNotEmptyArray.java

@@ -1,4 +1,4 @@
-// "Make annotation applicable to fields" "true"
+// "Make annotation applicable to fields" "true-preview"
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAnnotationTarget/beforeTargetIsMissing.java

@@ -1,4 +1,4 @@
-// "Make annotation applicable to type uses" "true"
+// "Make annotation applicable to type uses" "true-preview"
 import java.util.List;
 
 @interface Foo {}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAssert/afterCast.java

@@ -1,4 +1,4 @@
-// "Assert 'obj instanceof String'" "true"
+// "Assert 'obj instanceof String'" "true-preview"
 class X {
   void test(Object obj) {
     if (obj instanceof Integer) System.out.println();

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAssert/afterFieldInitializer.java

@@ -1,4 +1,4 @@
-// "Assert 'myFoo != null'" "true"
+// "Assert 'myFoo != null'" "true-preview"
 class A{
   private final String myFoo = Math.random() > 0.5 ? "" : null;
   String myBar;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAssert/afterForInitializer2.java

@@ -1,4 +1,4 @@
-// "Assert 'container != null'" "true"
+// "Assert 'container != null'" "true-preview"
 class A{
   void test(){
     Integer container = null;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAssert/afterInForDeclaration.java

@@ -1,4 +1,4 @@
-// "Assert 'list != null'" "true"
+// "Assert 'list != null'" "true-preview"
 import java.util.List;
 
 class A{

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAssert/afterLambda.java

@@ -1,4 +1,4 @@
-// "Assert 'container != null'" "true"
+// "Assert 'container != null'" "true-preview"
 import java.util.function.Supplier;
 
 class A{

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAssert/afterTryWithResources.java

@@ -1,4 +1,4 @@
-// "Assert 'foo != null'" "true"
+// "Assert 'foo != null'" "true-preview"
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.NotNull;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAssert/beforeCast.java

@@ -1,4 +1,4 @@
-// "Assert 'obj instanceof String'" "true"
+// "Assert 'obj instanceof String'" "true-preview"
 class X {
   void test(Object obj) {
     if (obj instanceof Integer) System.out.println();

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAssert/beforeFieldInitializer.java

@@ -1,4 +1,4 @@
-// "Assert 'myFoo != null'" "true"
+// "Assert 'myFoo != null'" "true-preview"
 class A{
   private final String myFoo = Math.random() > 0.5 ? "" : null;
   String myBar = myFoo.su<caret>bstring(0);

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAssert/beforeForInitializer2.java

@@ -1,4 +1,4 @@
-// "Assert 'container != null'" "true"
+// "Assert 'container != null'" "true-preview"
 class A{
   void test(){
     Integer container = null;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAssert/beforeInForDeclaration.java

@@ -1,4 +1,4 @@
-// "Assert 'list != null'" "true"
+// "Assert 'list != null'" "true-preview"
 import java.util.List;
 
 class A{

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAssert/beforeLambda.java

@@ -1,4 +1,4 @@
-// "Assert 'container != null'" "true"
+// "Assert 'container != null'" "true-preview"
 import java.util.function.Supplier;
 
 class A{

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAssert/beforeTryWithResources.java

@@ -1,4 +1,4 @@
-// "Assert 'foo != null'" "true"
+// "Assert 'foo != null'" "true-preview"
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.NotNull;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after1.java

@@ -1,4 +1,4 @@
-// "Add 'catch' clause(s)" "true"
+// "Add 'catch' clause(s)" "true-preview"
 class a {
     void g() throws Exception {
     }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after3.java

@@ -1,14 +1,14 @@
-// "Add 'catch' clause(s)" "true"
+// "Add 'catch' clause(s)" "true-preview"
 class a {
     void g() throws Exception {
     }
 
-    // initializer
+   // initializer
     {
         try {
-            // comment before
+           // comment before
             g();
-            // comment after
+           // comment after
         } catch (Exception e) {
             <caret><selection>throw new RuntimeException(e);</selection>
         }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after4.java

@@ -1,4 +1,4 @@
-// "Add 'catch' clause(s)" "true"
+// "Add 'catch' clause(s)" "true-preview"
 class MyException1 extends Exception {}
 class MyException2 extends Exception {}
 

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

@@ -1,4 +1,4 @@
-// "Add 'catch' clause(s)" "true"
+// "Add 'catch' clause(s)" "true-preview"
 import java.io.IOException;
 
 class Test {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after6.java

@@ -1,4 +1,4 @@
-// "Add 'catch' clause(s)" "true"
+// "Add 'catch' clause(s)" "true-preview"
 class Test {
     static class E1 extends Exception { }
     static class E2 extends Exception { }

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

@@ -1,4 +1,4 @@
-// "Add 'catch' clause(s)" "true"
+// "Add 'catch' clause(s)" "true-preview"
 class Test {
     static class E1 extends Exception { }
     static class E2 extends Exception { }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/afterHierarchy.java

@@ -1,7 +1,7 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 
-// "Add 'catch' clause(s)" "true"
+// "Add 'catch' clause(s)" "true-preview"
 class CatchExceptions {
 
 	void foo() throws java.io.IOException, java.io.FileNotFoundException {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/afterIncompleteTry.java

@@ -1,4 +1,4 @@
-// "Add 'catch' clause(s)" "true"
+// "Add 'catch' clause(s)" "true-preview"
 class Foo {
     void test(String s) {
         try {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/afterIncompleteTryHasUnchecked.java

@@ -1,4 +1,4 @@
-// "Add 'catch' clause(s)" "true"
+// "Add 'catch' clause(s)" "true-preview"
 class Foo {
     void test(String s) {
         try {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/afterInsideLambdaTryInside.java

@@ -1,4 +1,4 @@
-// "Add 'catch' clause(s)" "true"
+// "Add 'catch' clause(s)" "true-preview"
 import java.io.IOException;
 import java.util.function.Supplier;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/afterTypeParameter.java

@@ -1,4 +1,4 @@
-// "Surround with try/catch" "true"
+// "Surround with try/catch" "true-preview"
 class Test {
 
   interface I<E extends Exception> {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before1.java

@@ -1,4 +1,4 @@
-// "Add 'catch' clause(s)" "true"
+// "Add 'catch' clause(s)" "true-preview"
 class a {
     void g() throws Exception {
     }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before3.java

@@ -1,14 +1,14 @@
-// "Add 'catch' clause(s)" "true"
+// "Add 'catch' clause(s)" "true-preview"
 class a {
     void g() throws Exception {
     }
 
-    // initializer
+   // initializer
     {
         try {
-            // comment before
+           // comment before
             <caret>g();
-            // comment after
+           // comment after
         }
     }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before4.java

@@ -1,4 +1,4 @@
-// "Add 'catch' clause(s)" "true"
+// "Add 'catch' clause(s)" "true-preview"
 class MyException1 extends Exception {}
 class MyException2 extends Exception {}
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before5.java

@@ -1,4 +1,4 @@
-// "Add 'catch' clause(s)" "true"
+// "Add 'catch' clause(s)" "true-preview"
 import java.io.IOException;
 
 class Test {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before6.java

@@ -1,4 +1,4 @@
-// "Add 'catch' clause(s)" "true"
+// "Add 'catch' clause(s)" "true-preview"
 class Test {
     static class E1 extends Exception { }
     static class E2 extends Exception { }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before7.java

@@ -1,4 +1,4 @@
-// "Add 'catch' clause(s)" "true"
+// "Add 'catch' clause(s)" "true-preview"
 class Test {
     static class E1 extends Exception { }
     static class E2 extends Exception { }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/beforeHierarchy.java

@@ -1,4 +1,4 @@
-// "Add 'catch' clause(s)" "true"
+// "Add 'catch' clause(s)" "true-preview"
 class CatchExceptions {
 
 	void foo() throws java.io.IOException, java.io.FileNotFoundException {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/beforeIncompleteTry.java

@@ -1,4 +1,4 @@
-// "Add 'catch' clause(s)" "true"
+// "Add 'catch' clause(s)" "true-preview"
 class Foo {
     void test(String s) {
         try {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/beforeIncompleteTryHasUnchecked.java

@@ -1,4 +1,4 @@
-// "Add 'catch' clause(s)" "true"
+// "Add 'catch' clause(s)" "true-preview"
 class Foo {
     void test(String s) {
         try {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/beforeInsideLambdaTryInside.java

@@ -1,4 +1,4 @@
-// "Add 'catch' clause(s)" "true"
+// "Add 'catch' clause(s)" "true-preview"
 import java.io.IOException;
 import java.util.function.Supplier;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/beforeTypeParameter.java

@@ -1,4 +1,4 @@
-// "Surround with try/catch" "true"
+// "Surround with try/catch" "true-preview"
 class Test {
 
   interface I<E extends Exception> {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addDefaultConstructor/afterPackagePrivate.java

@@ -1,4 +1,4 @@
-// "Add package-private no-args constructor to X" "true"
+// "Add package-private no-args constructor to X" "true-preview"
 class X {
     X(int... a) {}
     X(String... b) {}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addDefaultConstructor/afterPrivate.java

@@ -1,4 +1,4 @@
-// "Add private no-args constructor to X" "true"
+// "Add private no-args constructor to X" "true-preview"
 class Z {
   private class X {
     X(int... a) {}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addDefaultConstructor/afterPublic.java

@@ -1,4 +1,4 @@
-// "Add public no-args constructor to X" "true"
+// "Add public no-args constructor to X" "true-preview"
 public class X {
     X(int... a) {}
     X(String... b) {}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addDefaultConstructor/afterPublicAbstract.java

@@ -1,4 +1,4 @@
-// "Add protected no-args constructor to X" "true"
+// "Add protected no-args constructor to X" "true-preview"
 public abstract class X {
     protected X(int... a) {}
     public X(String... b) {}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addDefaultConstructor/beforePackagePrivate.java

@@ -1,4 +1,4 @@
-// "Add package-private no-args constructor to X" "true"
+// "Add package-private no-args constructor to X" "true-preview"
 class X {
     X(int... a) {}
     X(String... b) {}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addDefaultConstructor/beforePrivate.java

@@ -1,4 +1,4 @@
-// "Add private no-args constructor to X" "true"
+// "Add private no-args constructor to X" "true-preview"
 class Z {
   private class X {
     X(int... a) {}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addDefaultConstructor/beforePublic.java

@@ -1,4 +1,4 @@
-// "Add public no-args constructor to X" "true"
+// "Add public no-args constructor to X" "true-preview"
 public class X {
     X(int... a) {}
     X(String... b) {}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addDefaultConstructor/beforePublicAbstract.java

@@ -1,4 +1,4 @@
-// "Add protected no-args constructor to X" "true"
+// "Add protected no-args constructor to X" "true-preview"
 public abstract class X {
     protected X(int... a) {}
     public X(String... b) {}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addEmptyRecordHeader/afterNoHeader.java

@@ -1,3 +1,3 @@
-// "Insert '()'" "true"
+// "Insert '()'" "true-preview"
 
 record A() {}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addEmptyRecordHeader/beforeNoHeader.java

@@ -1,3 +1,3 @@
-// "Insert '()'" "true"
+// "Insert '()'" "true-preview"
 
 record <caret>A {}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addExceptionToExistingCatch/afterHierarchy.java

@@ -1,4 +1,4 @@
-// "Replace 'C' with more generic 'A'" "true"
+// "Replace 'C' with more generic 'A'" "true-preview"
 import java.io.Exception;
 
 class A extends Exception {}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addExceptionToExistingCatch/afterMultipleExceptions.java

@@ -1,4 +1,4 @@
-// "Add exception to existing catch clause" "true"
+// "Add exception to existing catch clause" "true-preview"
 import java.io.IOException;
 
 class A extends Exception {}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addExceptionToExistingCatch/afterMultipleExceptionsReplace.java

@@ -1,4 +1,4 @@
-// "Replace 'C | D | B' with more generic 'A'" "true"
+// "Replace 'C | D | B' with more generic 'A'" "true-preview"
 import java.io.IOException;
 
 class A extends Exception {}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addExceptionToExistingCatch/afterSeveralCatches_Choose_X.java

@@ -1,4 +1,4 @@
-// "Add exception to existing catch clause" "true"
+// "Add exception to existing catch clause" "true-preview"
 import java.io.IOException;
 
 class X extends RuntimeException {}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addExceptionToExistingCatch/afterSeveralCatches_Choose_Y.java

@@ -1,4 +1,4 @@
-// "Add exception to existing catch clause" "true"
+// "Add exception to existing catch clause" "true-preview"
 import java.io.IOException;
 
 class X extends RuntimeException {}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addExceptionToExistingCatch/afterSingleCatch.java

@@ -1,4 +1,4 @@
-// "Add 'IOException' to catch with 'IndexOutOfBoundsException'" "true"
+// "Add 'IOException' to catch with 'IndexOutOfBoundsException'" "true-preview"
 import java.io.File;
 import java.io.IOException;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addExceptionToExistingCatch/beforeHierarchy.java

@@ -1,4 +1,4 @@
-// "Replace 'C' with more generic 'A'" "true"
+// "Replace 'C' with more generic 'A'" "true-preview"
 import java.io.Exception;
 
 class A extends Exception {}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addExceptionToExistingCatch/beforeMultipleExceptions.java

@@ -1,4 +1,4 @@
-// "Add exception to existing catch clause" "true"
+// "Add exception to existing catch clause" "true-preview"
 import java.io.IOException;
 
 class A extends Exception {}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addExceptionToExistingCatch/beforeMultipleExceptionsReplace.java

@@ -1,4 +1,4 @@
-// "Replace 'C | D | B' with more generic 'A'" "true"
+// "Replace 'C | D | B' with more generic 'A'" "true-preview"
 import java.io.IOException;
 
 class A extends Exception {}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addExceptionToExistingCatch/beforeSeveralCatches_Choose_X.java

@@ -1,4 +1,4 @@
-// "Add exception to existing catch clause" "true"
+// "Add exception to existing catch clause" "true-preview"
 import java.io.IOException;
 
 class X extends RuntimeException {}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addExceptionToExistingCatch/beforeSeveralCatches_Choose_Y.java

@@ -1,4 +1,4 @@
-// "Add exception to existing catch clause" "true"
+// "Add exception to existing catch clause" "true-preview"
 import java.io.IOException;
 
 class X extends RuntimeException {}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addExceptionToExistingCatch/beforeSingleCatch.java

@@ -1,4 +1,4 @@
-// "Add 'IOException' to catch with 'IndexOutOfBoundsException'" "true"
+// "Add 'IOException' to catch with 'IndexOutOfBoundsException'" "true-preview"
 import java.io.File;
 
 class Test {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addExceptionToExistingCatch/java6/after1.java

@@ -1,4 +1,4 @@
-// "Replace 'FileNotFoundException' with more generic 'IOException'" "true"
+// "Replace 'FileNotFoundException' with more generic 'IOException'" "true-preview"
 import java.io.*;
 
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addExceptionToExistingCatch/java6/after3.java

@@ -1,4 +1,4 @@
-// "Replace 'E1' with more generic 'E'" "true"
+// "Replace 'E1' with more generic 'E'" "true-preview"
 class C {
     static class E extends Exception { }
     static class E1 extends E { }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addExceptionToExistingCatch/java6/before1.java

@@ -1,4 +1,4 @@
-// "Replace 'FileNotFoundException' with more generic 'IOException'" "true"
+// "Replace 'FileNotFoundException' with more generic 'IOException'" "true-preview"
 import java.io.*;
 
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addExceptionToExistingCatch/java6/before3.java

@@ -1,4 +1,4 @@
-// "Replace 'E1' with more generic 'E'" "true"
+// "Replace 'E1' with more generic 'E'" "true-preview"
 class C {
     static class E extends Exception { }
     static class E1 extends E { }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addExceptionToExistingCatch/previewSeveralCatches_Choose_Y.java

@@ -0,0 +1,19 @@
+// "Add exception to existing catch clause" "true-preview"
+import java.io.IOException;
+
+class X extends RuntimeException {}
+class Y extends RuntimeException {}
+
+class Test {
+  public static void main(String[] args) {
+    try {
+      try {
+        throw new IOException();
+      }
+      catch (X | IOException x) {
+      }
+    }
+    catch (Y y) {
+    }
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addFinally/afterAddFinally.java

@@ -1,4 +1,4 @@
-// "Add 'finally' block" "true"
+// "Add 'finally' block" "true-preview"
 class Test {
   void foo() {
       try {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addFinally/beforeAddFinally.java

@@ -1,4 +1,4 @@
-// "Add 'finally' block" "true"
+// "Add 'finally' block" "true-preview"
 class Test {
   void foo() {
     try {}<caret>

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/after1.java

@@ -1,4 +1,4 @@
-// "Add method body" "true"
+// "Add method body" "true-preview"
 class a {
     void f() {
         

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/after2.java

@@ -1,4 +1,4 @@
-// "Add method body" "true"
+// "Add method body" "true-preview"
 class a {
     String f() {
         <caret><selection>return null;</selection>

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/after3.java

@@ -1,4 +1,4 @@
-// "Add method body" "true"
+// "Add method body" "true-preview"
 class a {
     a() {
         <caret><selection></selection>

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/after4.java

@@ -1,4 +1,4 @@
-// "Add method body" "true"
+// "Add method body" "true-preview"
 class a {
     String f() {
         <caret><selection>return null;</selection>

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/afterDefaultMethod.java

@@ -1,4 +1,4 @@
-// "Add method body" "true"
+// "Add method body" "true-preview"
 interface a {
     default String f() {
         <selection>return null;</selection>

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/afterSuperAndInterface.java

@@ -1,4 +1,4 @@
-// "Make 'a.f' not abstract" "true"
+// "Make 'a.f' not abstract" "true-preview"
 interface a {
     default String f() {
         return null;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/before1.java

@@ -1,4 +1,4 @@
-// "Add method body" "true"
+// "Add method body" "true-preview"
 class a {
  <caret>void f();
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/before2.java

@@ -1,4 +1,4 @@
-// "Add method body" "true"
+// "Add method body" "true-preview"
 class a {
  <caret>String f();
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/before3.java

@@ -1,4 +1,4 @@
-// "Add method body" "true"
+// "Add method body" "true-preview"
 class a {
  <caret>a();
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/before4.java

@@ -1,4 +1,4 @@
-// "Add method body" "true"
+// "Add method body" "true-preview"
 class a {
  <caret>abstract String f();
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/beforeDefaultMethod.java

@@ -1,4 +1,4 @@
-// "Add method body" "true"
+// "Add method body" "true-preview"
 interface a {
    default <caret>String f();
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/beforeSuperAndInterface.java

@@ -1,4 +1,4 @@
-// "Make 'a.f' not abstract" "true"
+// "Make 'a.f' not abstract" "true-preview"
 interface a {
    String f();
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMissingRequiredAnnotationParameters/afterFewParameters.java

@@ -1,4 +1,4 @@
-// "Add missing annotation parameters - value3, value2, value1" "true"
+// "Add missing annotation parameters - value3, value2, value1" "true-preview"
 class Test {
 
   @MyAnnotation(value3 = "", value2 = "", value1 = "")

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMissingRequiredAnnotationParameters/afterFewParameters2.java

@@ -1,4 +1,4 @@
-// "Add missing annotation parameters - value4, value1" "true"
+// "Add missing annotation parameters - value4, value1" "true-preview"
 class Test {
 
   @MyAnnotation(value4 = {}, value3 = "", value2 = "", value1 = {})

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMissingRequiredAnnotationParameters/afterFewParameters3.java

@@ -1,4 +1,4 @@
-// "Add missing annotation parameters - value4, value3, value2, value1" "true"
+// "Add missing annotation parameters - value4, value3, value2, value1" "true-preview"
 class Test {
 
   @MyAnnotation(value = "xxx", value4 = "", value3 = "", value2 = "", value1 = "")