Working on nullable inspection (merge)

.consulo/runConfigurations/consulo_run_desktop_awt.xml → .consulo/runConfigurations/consulo_run_desktop_awt_fork.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="consulo:run-desktop-awt" type="MavenRunConfiguration" factoryName="Maven" singleton="true">
+  <configuration default="false" name="consulo:run-desktop-awt-fork" type="MavenRunConfiguration" factoryName="Maven" singleton="true">
     <MavenSettings>
       <option name="myGeneralSettings" />
       <option name="myRunnerSettings">
@@ -14,7 +14,7 @@
           <option name="passParentEnv" value="true" />
           <option name="runMavenInBackground" value="true" />
           <option name="skipTests" value="false" />
-          <option name="vmOptions" value="--add-opens=java.desktop/sun.awt=ALL-UNNAMED --add-opens=java.desktop/sun.swing=ALL-UNNAMED --add-opens=java.desktop/sun.awt.image=ALL-UNNAMED --add-opens=java.desktop/sun.java2d=ALL-UNNAMED --add-opens=java.desktop/sun.font=ALL-UNNAMED --add-opens=java.desktop/java.awt=ALL-UNNAMED --add-opens=java.desktop/javax.swing=ALL-UNNAMED --add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens=java.desktop/java.awt.peer=ALL-UNNAMED --add-opens=java.desktop/java.awt.event=ALL-UNNAMED" />
+          <option name="vmOptions" value="" />
         </MavenRunnerSettings>
       </option>
       <option name="myRunnerParameters">
@@ -24,7 +24,7 @@
           </option>
           <option name="goals">
             <list>
-              <option value="consulo:run-desktop-awt" />
+              <option value="consulo:run-desktop-awt-fork" />
               <option value="-pl" />
               <option value=":consulo.java" />
             </list>

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

@@ -22,40 +22,56 @@
 import consulo.language.editor.inspection.LocalQuickFix;
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.editor.localize.CodeInsightLocalize;
+import consulo.language.psi.SmartPointerManager;
+import consulo.language.psi.SmartPsiElementPointer;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.logging.Logger;
 import consulo.project.Project;
+import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author yole
  */
 public class RemoveAnnotationQuickFix implements LocalQuickFix {
-  private static final Logger LOG = Logger.getInstance(RemoveAnnotationQuickFix.class);
-  private final PsiAnnotation myAnnotation;
-  private final PsiModifierListOwner myListOwner;
+    private static final Logger LOG = Logger.getInstance(RemoveAnnotationQuickFix.class);
+    private final SmartPsiElementPointer<PsiAnnotation> myAnnotation;
+    private final SmartPsiElementPointer<PsiModifierListOwner> myListOwner;
+    private final boolean myRemoveInheritors;
 
-  public RemoveAnnotationQuickFix(PsiAnnotation annotation, final PsiModifierListOwner listOwner) {
-    myAnnotation = annotation;
-    myListOwner = listOwner;
-  }
+    public RemoveAnnotationQuickFix(@NotNull PsiAnnotation annotation, @Nullable PsiModifierListOwner listOwner) {
+        this(annotation, listOwner, false);
+    }
+
+    public RemoveAnnotationQuickFix(@NotNull PsiAnnotation annotation, @Nullable PsiModifierListOwner listOwner, boolean removeInheritors) {
+        Project project = annotation.getProject();
+        SmartPointerManager pm = SmartPointerManager.getInstance(project);
+        myAnnotation = pm.createSmartPsiElementPointer(annotation);
+        myListOwner = listOwner == null ? null : pm.createSmartPsiElementPointer(listOwner);
+        myRemoveInheritors = removeInheritors;
+    }
 
-  @Override
-  public LocalizeValue getName() {
-    return CodeInsightLocalize.removeAnnotation();
-  }
+    @Override
+    public LocalizeValue getName() {
+        return CodeInsightLocalize.removeAnnotation();
+    }
 
-  @Override
-  public void applyFix(Project project, ProblemDescriptor descriptor) {
-    if (myAnnotation.isPhysical()) {
-      try {
-        if (!FileModificationService.getInstance().preparePsiElementForWrite(myAnnotation)) return;
-        myAnnotation.delete();
-      } catch (IncorrectOperationException e) {
-        LOG.error(e);
-      }
-    } else {
-      ExternalAnnotationsManager.getInstance(project).deannotate(myListOwner, myAnnotation.getQualifiedName());
+    @Override
+    public void applyFix(Project project, ProblemDescriptor descriptor) {
+        if (myAnnotation.isPhysical()) {
+            try {
+                if (!FileModificationService.getInstance().preparePsiElementForWrite(myAnnotation)) {
+                    return;
+                }
+                myAnnotation.delete();
+            }
+            catch (IncorrectOperationException e) {
+                LOG.error(e);
+            }
+        }
+        else {
+            ExternalAnnotationsManager.getInstance(project).deannotate(myListOwner, myAnnotation.getQualifiedName());
+        }
     }
-  }
 }