Fixing preprocessUsages in BaseRefactoringProcessor descendants.

unv-unv · unv-unv · commit 9d86403ef8bb · 2025-05-23T05:30:13.000+03:00
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/convertToInstanceMethod/ConvertToInstanceMethodProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/convertToInstanceMethod/ConvertToInstanceMethodProcessor.java
@@ -42,11 +42,12 @@
 import consulo.localize.LocalizeValue;
 import consulo.logging.Logger;
 import consulo.project.Project;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.usage.UsageInfo;
 import consulo.usage.UsageViewDescriptor;
 import consulo.util.collection.MultiMap;
 import consulo.util.dataholder.Key;
-import consulo.util.lang.ref.Ref;
+import consulo.util.lang.ref.SimpleReference;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -137,7 +138,9 @@ else if (element instanceof PsiDocTagValue) {
         return result.toArray(new UsageInfo[result.size()]);
     }
 
-    protected boolean preprocessUsages(Ref<UsageInfo[]> refUsages) {
+    @Override
+    @RequiredUIAccess
+    protected boolean preprocessUsages(@Nonnull SimpleReference<UsageInfo[]> refUsages) {
         UsageInfo[] usagesIn = refUsages.get();
         MultiMap<PsiElement, String> conflicts = new MultiMap<PsiElement, String>();
         final Set<PsiMember> methods = Collections.singleton((PsiMember)myMethod);
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2000-2013 JetBrains s.r.o.
  *
@@ -44,7 +43,7 @@
 import consulo.usage.UsageViewUtil;
 import consulo.util.collection.ContainerUtil;
 import consulo.util.collection.MultiMap;
-import consulo.util.lang.ref.Ref;
+import consulo.util.lang.ref.SimpleReference;
 import jakarta.annotation.Nonnull;
 
 import java.util.*;
@@ -90,7 +89,8 @@ protected String getCommandName() {
         return RefactoringLocalize.encapsulateFieldsCommandName(DescriptiveNameUtil.getDescriptiveName(myClass)).get();
     }
 
-    protected boolean preprocessUsages(Ref<UsageInfo[]> refUsages) {
+    @Override
+    protected boolean preprocessUsages(@Nonnull SimpleReference<UsageInfo[]> refUsages) {
         final MultiMap<PsiElement, String> conflicts = new MultiMap<PsiElement, String>();
 
         checkExistingMethods(conflicts, true);
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/extractclass/ExtractClassProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/extractclass/ExtractClassProcessor.java
@@ -173,7 +173,7 @@ public PsiClass getCreatedClass() {
 
     @Override
     @RequiredUIAccess
-    protected boolean preprocessUsages(@Nonnull final SimpleReference<UsageInfo[]> refUsages) {
+    protected boolean preprocessUsages(@Nonnull SimpleReference<UsageInfo[]> refUsages) {
         final MultiMap<PsiElement, String> conflicts = new MultiMap<>();
         myExtractEnumProcessor.findEnumConstantConflicts(refUsages);
         if (!DestinationFolderComboBox.isAccessible(
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java
@@ -49,9 +49,10 @@
 import consulo.logging.Logger;
 import consulo.project.Project;
 import consulo.project.ui.wm.WindowManager;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.usage.*;
 import consulo.util.collection.MultiMap;
-import consulo.util.lang.ref.Ref;
+import consulo.util.lang.ref.SimpleReference;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
@@ -186,7 +187,9 @@ private FieldAccessibility getFieldAccessibility(PsiElement element) {
         return FieldAccessibility.INVISIBLE;
     }
 
-    protected boolean preprocessUsages(Ref<UsageInfo[]> refUsages) {
+    @Override
+    @RequiredUIAccess
+    protected boolean preprocessUsages(@Nonnull SimpleReference<UsageInfo[]> refUsages) {
         final UsageInfo[] usagesIn = refUsages.get();
         ArrayList<UsageInfo> oldUsages = new ArrayList<UsageInfo>();
         addAll(oldUsages, usagesIn);
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineMethodProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineMethodProcessor.java
@@ -59,13 +59,14 @@
 import consulo.localize.LocalizeValue;
 import consulo.logging.Logger;
 import consulo.project.Project;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.usage.NonCodeUsageInfo;
 import consulo.usage.UsageInfo;
 import consulo.usage.UsageViewDescriptor;
 import consulo.util.collection.MultiMap;
 import consulo.util.dataholder.Key;
 import consulo.util.lang.StringUtil;
-import consulo.util.lang.ref.Ref;
+import consulo.util.lang.ref.SimpleReference;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
@@ -191,7 +192,9 @@ protected void refreshElements(PsiElement[] elements) {
         myMethod = (PsiMethod)elements[0];
     }
 
-    protected boolean preprocessUsages(Ref<UsageInfo[]> refUsages) {
+    @Override
+    @RequiredUIAccess
+    protected boolean preprocessUsages(@Nonnull SimpleReference<UsageInfo[]> refUsages) {
         if (!myInlineThisOnly && checkReadOnly()) {
             if (!CommonRefactoringUtil.checkReadOnlyStatus(myProject, myMethod)) {
                 return false;
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineParameterExpressionProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineParameterExpressionProcessor.java
@@ -178,7 +178,7 @@ public void visitReferenceExpression(PsiReferenceExpression referenceExpression)
 
     @Override
     @RequiredUIAccess
-    protected boolean preprocessUsages(SimpleReference<UsageInfo[]> refUsages) {
+    protected boolean preprocessUsages(@Nonnull SimpleReference<UsageInfo[]> refUsages) {
         MultiMap<PsiElement, String> conflicts = new MultiMap<>();
         UsageInfo[] usages = refUsages.get();
         InaccessibleExpressionsDetector detector = new InaccessibleExpressionsDetector(conflicts);
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineToAnonymousClassProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineToAnonymousClassProcessor.java
@@ -31,10 +31,11 @@
 import consulo.logging.Logger;
 import consulo.project.Project;
 import consulo.project.ui.wm.WindowManager;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.usage.UsageInfo;
 import consulo.usage.UsageViewDescriptor;
 import consulo.util.collection.MultiMap;
-import consulo.util.lang.ref.Ref;
+import consulo.util.lang.ref.SimpleReference;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -140,7 +141,9 @@ private static boolean isForcePreview(final UsageInfo usage) {
         return false;
     }
 
-    protected boolean preprocessUsages(final Ref<UsageInfo[]> refUsages) {
+    @Override
+    @RequiredUIAccess
+    protected boolean preprocessUsages(@Nonnull SimpleReference<UsageInfo[]> refUsages) {
         MultiMap<PsiElement, String> conflicts = getConflicts(refUsages.get());
         if (!conflicts.isEmpty()) {
             return showConflicts(conflicts, refUsages.get());
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/makeStatic/MakeMethodOrClassStaticProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/makeStatic/MakeMethodOrClassStaticProcessor.java
@@ -13,15 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-/*
- * Created by IntelliJ IDEA.
- * User: dsl
- * Date: 16.04.2002
- * Time: 15:37:30
- * To change template for new class use
- * Code Style | Class Templates options (Tools | IDE Options).
- */
 package com.intellij.java.impl.refactoring.makeStatic;
 
 import com.intellij.java.impl.refactoring.util.ConflictsUtil;
@@ -44,19 +35,25 @@
 import consulo.localize.LocalizeValue;
 import consulo.logging.Logger;
 import consulo.project.Project;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.usage.UsageInfo;
 import consulo.usage.UsageViewDescriptor;
 import consulo.usage.UsageViewUtil;
 import consulo.util.collection.ContainerUtil;
 import consulo.util.collection.MultiMap;
 import consulo.util.lang.StringUtil;
 import consulo.util.lang.ref.Ref;
+import consulo.util.lang.ref.SimpleReference;
 import jakarta.annotation.Nonnull;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 
+/*
+ * @author dsl
+ * @since 2002-04-16
+ */
 public abstract class MakeMethodOrClassStaticProcessor<T extends PsiTypeParameterListOwner> extends BaseRefactoringProcessor {
     private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.makeMethodStatic.MakeMethodStaticProcessor");
 
@@ -74,7 +71,9 @@ protected UsageViewDescriptor createUsageViewDescriptor(UsageInfo[] usages) {
         return new MakeMethodOrClassStaticViewDescriptor(myMember);
     }
 
-    protected final boolean preprocessUsages(final Ref<UsageInfo[]> refUsages) {
+    @Override
+    @RequiredUIAccess
+    protected final boolean preprocessUsages(@Nonnull SimpleReference<UsageInfo[]> refUsages) {
         UsageInfo[] usagesIn = refUsages.get();
         if (myPrepareSuccessfulSwingThreadCallback != null) {
             MultiMap<PsiElement, String> conflicts = getConflictDescriptions(usagesIn);
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/memberPushDown/PushDownProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/memberPushDown/PushDownProcessor.java
@@ -51,6 +51,7 @@
 import consulo.usage.UsageViewDescriptor;
 import consulo.util.dataholder.Key;
 import consulo.util.lang.ref.Ref;
+import consulo.util.lang.ref.SimpleReference;
 import jakarta.annotation.Nonnull;
 
 import java.util.*;
@@ -95,8 +96,9 @@ protected UsageInfo[] findUsages() {
         return usages;
     }
 
+    @Override
     @RequiredUIAccess
-    protected boolean preprocessUsages(final Ref<UsageInfo[]> refUsages) {
+    protected boolean preprocessUsages(@Nonnull SimpleReference<UsageInfo[]> refUsages) {
         final UsageInfo[] usagesIn = refUsages.get();
         final PushDownConflicts pushDownConflicts = new PushDownConflicts(myClass, myMemberInfos);
         pushDownConflicts.checkSourceClassConflicts();
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveClassesOrPackages/MoveClassToInnerProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveClassesOrPackages/MoveClassToInnerProcessor.java
@@ -121,7 +121,7 @@ public UsageInfo[] findUsages() {
 
     @Override
     @RequiredUIAccess
-    protected boolean preprocessUsages(SimpleReference<UsageInfo[]> refUsages) {
+    protected boolean preprocessUsages(@Nonnull SimpleReference<UsageInfo[]> refUsages) {
         UsageInfo[] usages = refUsages.get();
         return showConflicts(getConflicts(usages), usages);
     }
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesProcessor.java
@@ -52,7 +52,7 @@
 import consulo.util.collection.MultiMap;
 import consulo.util.lang.Comparing;
 import consulo.util.lang.StringUtil;
-import consulo.util.lang.ref.Ref;
+import consulo.util.lang.ref.SimpleReference;
 import consulo.virtualFileSystem.VirtualFile;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
@@ -226,8 +226,9 @@ public Collection<String> getConflicts() {
         }
     }
 
+    @Override
     @RequiredUIAccess
-    protected boolean preprocessUsages(Ref<UsageInfo[]> refUsages) {
+    protected boolean preprocessUsages(@Nonnull SimpleReference<UsageInfo[]> refUsages) {
         UsageInfo[] usages = refUsages.get();
         MultiMap<PsiElement, String> conflicts = new MultiMap<>();
         ArrayList<UsageInfo> filteredUsages = new ArrayList<>();
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveInner/MoveInnerProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveInner/MoveInnerProcessor.java
@@ -44,12 +44,13 @@
 import consulo.navigation.OpenFileDescriptor;
 import consulo.navigation.OpenFileDescriptorFactory;
 import consulo.project.Project;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.usage.NonCodeUsageInfo;
 import consulo.usage.UsageInfo;
 import consulo.usage.UsageViewDescriptor;
 import consulo.util.collection.MultiMap;
 import consulo.util.lang.StringUtil;
-import consulo.util.lang.ref.Ref;
+import consulo.util.lang.ref.SimpleReference;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
@@ -58,9 +59,8 @@
 import java.util.function.Function;
 
 /**
- * created at Sep 24, 2001
- *
  * @author Jeka
+ * @since 2001-09-24
  */
 public class MoveInnerProcessor extends BaseRefactoringProcessor {
     private static final Logger LOG = Logger.getInstance(MoveInnerProcessor.class);
@@ -336,7 +336,9 @@ protected void performPsiSpoilingRefactoring() {
         }
     }
 
-    protected boolean preprocessUsages(Ref<UsageInfo[]> refUsages) {
+    @Override
+    @RequiredUIAccess
+    protected boolean preprocessUsages(@Nonnull SimpleReference<UsageInfo[]> refUsages) {
         final MultiMap<PsiElement, String> conflicts = new MultiMap<PsiElement, String>();
         final HashMap<PsiElement, HashSet<PsiElement>> reported = new HashMap<PsiElement, HashSet<PsiElement>>();
         class Visitor extends JavaRecursiveElementWalkingVisitor {
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java
@@ -41,12 +41,13 @@
 import consulo.localize.LocalizeValue;
 import consulo.logging.Logger;
 import consulo.project.Project;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.usage.UsageInfo;
 import consulo.usage.UsageViewDescriptor;
 import consulo.usage.UsageViewUtil;
 import consulo.util.collection.MultiMap;
 import consulo.util.lang.Comparing;
-import consulo.util.lang.ref.Ref;
+import consulo.util.lang.ref.SimpleReference;
 import jakarta.annotation.Nonnull;
 import org.jetbrains.annotations.NonNls;
 
@@ -96,7 +97,9 @@ protected UsageViewDescriptor createUsageViewDescriptor(UsageInfo[] usages) {
         return new MoveInstanceMethodViewDescriptor(myMethod, myTargetVariable, myTargetClass);
     }
 
-    protected boolean preprocessUsages(Ref<UsageInfo[]> refUsages) {
+    @Override
+    @RequiredUIAccess
+    protected boolean preprocessUsages(@Nonnull SimpleReference<UsageInfo[]> refUsages) {
         final UsageInfo[] usages = refUsages.get();
         MultiMap<PsiElement, String> conflicts = new MultiMap<PsiElement, String>();
         final Set<PsiMember> members = new HashSet<PsiMember>();
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveMembers/MoveMembersProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveMembers/MoveMembersProcessor.java
@@ -20,7 +20,6 @@
 import com.intellij.java.language.psi.*;
 import com.intellij.java.language.util.VisibilityUtil;
 import consulo.language.editor.refactoring.BaseRefactoringProcessor;
-import consulo.language.editor.refactoring.RefactoringBundle;
 import consulo.language.editor.refactoring.event.RefactoringElementListener;
 import consulo.language.editor.refactoring.localize.RefactoringLocalize;
 import consulo.language.editor.refactoring.move.MoveCallback;
@@ -43,17 +42,15 @@
 import consulo.usage.UsageViewUtil;
 import consulo.util.collection.ContainerUtil;
 import consulo.util.collection.MultiMap;
-import consulo.util.lang.ref.Ref;
-
+import consulo.util.lang.ref.SimpleReference;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 import java.util.*;
 
 /**
- * created at Sep 11, 2001
- *
  * @author Jeka
+ * @since 2001-09-11
  */
 public class MoveMembersProcessor extends BaseRefactoringProcessor {
     private static final Logger LOG = Logger.getInstance(MoveMembersProcessor.class);
@@ -298,7 +295,9 @@ private void fixModifierList(PsiMember member, PsiMember newMember, final UsageI
         VisibilityUtil.fixVisibility(UsageViewUtil.toElements(infos), newMember, myNewVisibility);
     }
 
-    protected boolean preprocessUsages(@Nonnull Ref<UsageInfo[]> refUsages) {
+    @Override
+    @RequiredUIAccess
+    protected boolean preprocessUsages(@Nonnull SimpleReference<UsageInfo[]> refUsages) {
         final MultiMap<PsiElement, String> conflicts = new MultiMap<PsiElement, String>();
         final UsageInfo[] usages = refUsages.get();
 
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/replaceConstructorWithFactory/ReplaceConstructorWithFactoryProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/replaceConstructorWithFactory/ReplaceConstructorWithFactoryProcessor.java
@@ -34,10 +34,11 @@
 import consulo.localize.LocalizeValue;
 import consulo.logging.Logger;
 import consulo.project.Project;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.usage.UsageInfo;
 import consulo.usage.UsageViewDescriptor;
 import consulo.util.collection.MultiMap;
-import consulo.util.lang.ref.Ref;
+import consulo.util.lang.ref.SimpleReference;
 import jakarta.annotation.Nonnull;
 import org.jetbrains.annotations.NonNls;
 
@@ -140,7 +141,9 @@ else if (element instanceof PsiClass) {
         return usages.toArray(new UsageInfo[usages.size()]);
     }
 
-    protected boolean preprocessUsages(Ref<UsageInfo[]> refUsages) {
+    @Override
+    @RequiredUIAccess
+    protected boolean preprocessUsages(@Nonnull SimpleReference<UsageInfo[]> refUsages) {
         UsageInfo[] usages = refUsages.get();
 
         MultiMap<PsiElement, String> conflicts = new MultiMap<PsiElement, String>();
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/turnRefsToSuper/TurnRefsToSuperProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/turnRefsToSuper/TurnRefsToSuperProcessor.java
@@ -30,11 +30,12 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.logging.Logger;
 import consulo.project.Project;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.ex.awt.Messages;
 import consulo.usage.UsageInfo;
 import consulo.usage.UsageViewDescriptor;
 import consulo.usage.UsageViewUtil;
-import consulo.util.lang.ref.Ref;
+import consulo.util.lang.ref.SimpleReference;
 import jakarta.annotation.Nonnull;
 
 import java.util.ArrayList;
@@ -90,7 +91,9 @@ protected void refreshElements(final PsiElement[] elements) {
         setClasses((PsiClass)elements[0], (PsiClass)elements[1]);
     }
 
-    protected boolean preprocessUsages(@Nonnull Ref<UsageInfo[]> refUsages) {
+    @Override
+    @RequiredUIAccess
+    protected boolean preprocessUsages(@Nonnull SimpleReference<UsageInfo[]> refUsages) {
         if (!ApplicationManager.getApplication().isUnitTestMode() && refUsages.get().length == 0) {
             String message = RefactoringLocalize.noUsagesCanBeReplaced(myClass.getQualifiedName(), mySuper.getQualifiedName()).get();
             Messages.showInfoMessage(myProject, message, TurnRefsToSuperHandler.REFACTORING_NAME);
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/turnRefsToSuper/TurnRefsToSuperProcessorBase.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/turnRefsToSuper/TurnRefsToSuperProcessorBase.java

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public UsageInfo[] findUsages() {`
`121`	`121`
`122`	`122`	`@Override`
`123`	`123`	`@RequiredUIAccess`
`124`		`- protected boolean preprocessUsages(SimpleReference<UsageInfo[]> refUsages) {`
	`124`	`+ protected boolean preprocessUsages(@Nonnull SimpleReference<UsageInfo[]> refUsages) {`
`125`	`125`	`UsageInfo[] usages = refUsages.get();`
`126`	`126`	`return showConflicts(getConflicts(usages), usages);`
`127`	`127`	`}`