mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
IJ-CR-153713 revert visibility to public
GitOrigin-RevId: 3ffb861b24257050035ccc6076716eab4b321dd4
This commit is contained in:
committed by
intellij-monorepo-bot
parent
22d7628468
commit
fe1a54bdc4
+1
-1
@@ -191,7 +191,7 @@ final class ConvertToRecordProcessor extends BaseRefactoringProcessor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
final UsageInfo[] usages = refUsages.get();
|
||||
MultiMap<PsiElement, @NlsContexts.DialogMessage String> conflicts = new MultiMap<>();
|
||||
RenameUtil.addConflictDescriptions(usages, conflicts);
|
||||
|
||||
+1
-1
@@ -56,7 +56,7 @@ public class ChangeClassSignatureProcessor extends BaseRefactoringProcessor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
final MultiMap<PsiElement, String> conflicts = new MultiMap<>();
|
||||
|
||||
final PsiTypeParameter[] parameters = myClass.getTypeParameters();
|
||||
|
||||
+1
-1
@@ -99,7 +99,7 @@ public class ChangeSignatureProcessor extends ChangeSignatureProcessorBase {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
for (ChangeSignatureUsageProcessor processor : ChangeSignatureUsageProcessor.EP_NAME.getExtensions()) {
|
||||
if (!processor.setupDefaultValues(myChangeInfo, refUsages, myProject)) return false;
|
||||
}
|
||||
|
||||
+1
-1
@@ -151,7 +151,7 @@ public final class ConvertToInstanceMethodProcessor extends BaseRefactoringProce
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
UsageInfo[] usagesIn = refUsages.get();
|
||||
MultiMap<PsiElement, @DialogMessage String> conflicts = new MultiMap<>();
|
||||
final Set<PsiMember> methods = Collections.singleton(myMethod);
|
||||
|
||||
+1
-1
@@ -98,7 +98,7 @@ public class EncapsulateFieldsProcessor extends BaseRefactoringProcessor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
final MultiMap<PsiElement, String> conflicts = new MultiMap<>();
|
||||
|
||||
checkExistingMethods(conflicts, true);
|
||||
|
||||
+1
-1
@@ -140,7 +140,7 @@ public class ExtractClassProcessor extends FixableUsagesRefactoringProcessor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(final @NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(final @NotNull Ref<UsageInfo[]> refUsages) {
|
||||
final MultiMap<PsiElement, @Nls String> conflicts = new MultiMap<>();
|
||||
myExtractEnumProcessor.findEnumConstantConflicts(refUsages);
|
||||
if (!DestinationFolderComboBox.isAccessible(myProject, sourceClass.getContainingFile().getVirtualFile(),
|
||||
|
||||
+1
-1
@@ -170,7 +170,7 @@ public class InheritanceToDelegationProcessor extends BaseRefactoringProcessor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
final UsageInfo[] usagesIn = refUsages.get();
|
||||
ArrayList<UsageInfo> oldUsages = new ArrayList<>();
|
||||
Collections.addAll(oldUsages, usagesIn);
|
||||
|
||||
+2
-2
@@ -71,7 +71,7 @@ public class InlineConstantFieldProcessor extends BaseRefactoringProcessor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isPreviewUsages(UsageInfo @NotNull [] usages) {
|
||||
protected boolean isPreviewUsages(UsageInfo @NotNull [] usages) {
|
||||
if (super.isPreviewUsages(usages)) return true;
|
||||
for (UsageInfo info : usages) {
|
||||
if (info instanceof NonCodeUsageInfo) return true;
|
||||
@@ -212,7 +212,7 @@ public class InlineConstantFieldProcessor extends BaseRefactoringProcessor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
UsageInfo[] usagesIn = refUsages.get();
|
||||
MultiMap<PsiElement, @DialogMessage String> conflicts = new MultiMap<>();
|
||||
|
||||
|
||||
+2
-2
@@ -192,7 +192,7 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isPreviewUsages(UsageInfo @NotNull [] usages) {
|
||||
protected boolean isPreviewUsages(UsageInfo @NotNull [] usages) {
|
||||
for (UsageInfo usage : usages) {
|
||||
if (usage instanceof NonCodeUsageInfo) return true;
|
||||
}
|
||||
@@ -215,7 +215,7 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
if (!myInlineThisOnly && checkReadOnly()) {
|
||||
if (!CommonRefactoringUtil.checkReadOnlyStatus(myProject, myMethod)) return false;
|
||||
}
|
||||
|
||||
+1
-1
@@ -240,7 +240,7 @@ public final class InlineObjectProcessor extends BaseRefactoringProcessor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
final UsageInfo[] usagesIn = refUsages.get();
|
||||
final MultiMap<PsiElement, String> conflicts = new MultiMap<>();
|
||||
final ReferencedElementsCollector collector = new ReferencedElementsCollector();
|
||||
|
||||
+1
-1
@@ -180,7 +180,7 @@ public class InlineParameterExpressionProcessor extends BaseRefactoringProcessor
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
final MultiMap<PsiElement, String> conflicts = new MultiMap<>();
|
||||
JavaSafeDeleteProcessor.collectMethodConflicts(conflicts, myMethod, myParameter);
|
||||
final UsageInfo[] usages = refUsages.get();
|
||||
|
||||
+2
-2
@@ -103,7 +103,7 @@ public class InlineToAnonymousClassProcessor extends BaseRefactoringProcessor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isPreviewUsages(UsageInfo @NotNull [] usages) {
|
||||
protected boolean isPreviewUsages(UsageInfo @NotNull [] usages) {
|
||||
if (super.isPreviewUsages(usages)) return true;
|
||||
for(UsageInfo usage: usages) {
|
||||
if (isForcePreview(usage)) {
|
||||
@@ -127,7 +127,7 @@ public class InlineToAnonymousClassProcessor extends BaseRefactoringProcessor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(final @NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(final @NotNull Ref<UsageInfo[]> refUsages) {
|
||||
MultiMap<PsiElement, String> conflicts = getConflicts(refUsages.get());
|
||||
if (!conflicts.isEmpty()) {
|
||||
return showConflicts(conflicts, refUsages.get());
|
||||
|
||||
+1
-1
@@ -224,7 +224,7 @@ public class InlineSuperClassRefactoringProcessor extends FixableUsagesRefactori
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(final @NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(final @NotNull Ref<UsageInfo[]> refUsages) {
|
||||
final MultiMap<PsiElement, @DialogMessage String> conflicts = new MultiMap<>();
|
||||
if (!ProgressManager.getInstance()
|
||||
.runProcessWithProgressSynchronously(() -> ReadAction.run(() -> collectConflicts(conflicts)),
|
||||
|
||||
+1
-1
@@ -236,7 +236,7 @@ public class IntroduceParameterProcessor extends BaseRefactoringProcessor implem
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
UsageInfo[] usagesIn = refUsages.get();
|
||||
MultiMap<PsiElement, @Nls String> conflicts = new MultiMap<>();
|
||||
|
||||
|
||||
+1
-1
@@ -73,7 +73,7 @@ public abstract class MakeMethodOrClassStaticProcessor<T extends PsiTypeParamete
|
||||
}
|
||||
|
||||
@Override
|
||||
public final boolean preprocessUsages(final @NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected final boolean preprocessUsages(final @NotNull Ref<UsageInfo[]> refUsages) {
|
||||
UsageInfo[] usagesIn = refUsages.get();
|
||||
if (ApplicationManager.getApplication().isUnitTestMode() && !BaseRefactoringProcessor.ConflictsInTestsException.isTestIgnore()) {
|
||||
MultiMap<PsiElement, @Nls String> conflictDescriptions = getConflictDescriptions(usagesIn);
|
||||
|
||||
+1
-1
@@ -117,7 +117,7 @@ public class MigrationProcessor extends BaseRefactoringProcessor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
if (refUsages.get().length == 0) {
|
||||
Messages.showInfoMessage(myProject, JavaRefactoringBundle.message("migration.no.usages.found.in.the.project"), getRefactoringName());
|
||||
return false;
|
||||
|
||||
+1
-1
@@ -90,7 +90,7 @@ public class MoveClassToInnerProcessor extends BaseRefactoringProcessor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(final @NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(final @NotNull Ref<UsageInfo[]> refUsages) {
|
||||
final UsageInfo[] usages = refUsages.get();
|
||||
return showConflicts(getConflicts(usages), usages);
|
||||
}
|
||||
|
||||
+2
-2
@@ -262,7 +262,7 @@ public class MoveClassesOrPackagesProcessor extends BaseRefactoringProcessor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
final UsageInfo[] usages = refUsages.get();
|
||||
return showConflicts(myConflicts, usages);
|
||||
}
|
||||
@@ -473,7 +473,7 @@ public class MoveClassesOrPackagesProcessor extends BaseRefactoringProcessor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isPreviewUsages(UsageInfo @NotNull [] usages) {
|
||||
protected boolean isPreviewUsages(UsageInfo @NotNull [] usages) {
|
||||
if (UsageViewUtil.reportNonRegularUsages(usages, myProject)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
+1
-1
@@ -348,7 +348,7 @@ public class MoveInnerProcessor extends BaseRefactoringProcessor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
final MultiMap<PsiElement, String> conflicts = new MultiMap<>();
|
||||
final HashMap<PsiElement,HashSet<PsiElement>> reported = new HashMap<>();
|
||||
class Visitor extends JavaRecursiveElementWalkingVisitor {
|
||||
|
||||
+1
-1
@@ -90,7 +90,7 @@ public class MoveInstanceMethodProcessor extends BaseRefactoringProcessor{
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
final UsageInfo[] usages = refUsages.get();
|
||||
MultiMap<PsiElement, @DialogMessage String> conflicts = new MultiMap<>();
|
||||
final Set<PsiMember> members = new HashSet<>();
|
||||
|
||||
+1
-1
@@ -291,7 +291,7 @@ public class MoveMembersProcessor extends BaseRefactoringProcessor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
final MultiMap<PsiElement, String> conflicts = new MultiMap<>();
|
||||
final UsageInfo[] usages = refUsages.get();
|
||||
|
||||
|
||||
+1
-1
@@ -312,7 +312,7 @@ public class ReplaceConstructorWithBuilderProcessor extends FixableUsagesRefacto
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
final MultiMap<PsiElement, @NlsContexts.DialogMessage String> conflicts = new MultiMap<>();
|
||||
if (myMoveDestination != null && myCreateNewBuilderClass) {
|
||||
myMoveDestination.analyzeModuleConflicts(Collections.emptyList(), conflicts, refUsages.get());
|
||||
|
||||
+1
-1
@@ -73,7 +73,7 @@ public class TurnRefsToSuperProcessor extends TurnRefsToSuperProcessorBase {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
if (!ApplicationManager.getApplication().isUnitTestMode() && refUsages.get().length == 0) {
|
||||
String message = JavaRefactoringBundle.message("no.usages.can.be.replaced", myClass.getQualifiedName(), mySuper.getQualifiedName());
|
||||
Messages.showInfoMessage(myProject, message, TurnRefsToSuperHandler.getRefactoringName());
|
||||
|
||||
+1
-1
@@ -47,7 +47,7 @@ public abstract class TurnRefsToSuperProcessorBase extends BaseRefactoringProces
|
||||
private final List<UsageInfo> myVariablesUsages = new ArrayList<>();
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
UsageInfo[] usages = refUsages.get();
|
||||
List<UsageInfo> filtered = new ArrayList<>();
|
||||
for (UsageInfo usage : usages) {
|
||||
|
||||
+1
-1
@@ -130,7 +130,7 @@ public class TypeMigrationProcessor extends BaseRefactoringProcessor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
if (hasFailedConversions()) {
|
||||
if (ApplicationManager.getApplication().isUnitTestMode()) {
|
||||
if (ourSkipFailedConversionInTestMode) {
|
||||
|
||||
@@ -117,7 +117,7 @@ public abstract class ChangeSignatureBaseTest extends LightRefactoringTestCase {
|
||||
newName != null ? newName : method.getName(),
|
||||
newType, genParams.genParams(method), genExceptions.genExceptions(method)) {
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
try {
|
||||
return super.preprocessUsages(refUsages);
|
||||
}
|
||||
|
||||
@@ -15739,7 +15739,7 @@ a:com.intellij.refactoring.changeSignature.ChangeSignatureProcessorBase
|
||||
- getChangeInfo():com.intellij.refactoring.changeSignature.ChangeInfo
|
||||
- p:getCommandName():java.lang.String
|
||||
- p:getRefactoringId():java.lang.String
|
||||
- isPreviewUsages(com.intellij.usageView.UsageInfo[]):Z
|
||||
- p:isPreviewUsages(com.intellij.usageView.UsageInfo[]):Z
|
||||
- p:performRefactoring(com.intellij.usageView.UsageInfo[]):V
|
||||
f:com.intellij.refactoring.changeSignature.DefaultValueChooser
|
||||
- com.intellij.openapi.ui.DialogWrapper
|
||||
@@ -16313,7 +16313,6 @@ a:com.intellij.refactoring.introduceParameterObject.IntroduceParameterObjectDele
|
||||
f:com.intellij.refactoring.introduceParameterObject.IntroduceParameterObjectProcessor
|
||||
- com.intellij.refactoring.util.FixableUsagesRefactoringProcessor
|
||||
- <init>(com.intellij.psi.PsiNamedElement,com.intellij.refactoring.introduceParameterObject.IntroduceParameterObjectClassDescriptor,java.util.List,Z):V
|
||||
- preprocessUsages(com.intellij.openapi.util.Ref):Z
|
||||
f:com.intellij.refactoring.introduceParameterObject.IntroduceParameterObjectProcessor$ChangeSignatureUsageWrapper
|
||||
- com.intellij.refactoring.util.FixableUsageInfo
|
||||
- <init>(com.intellij.usageView.UsageInfo):V
|
||||
@@ -16344,7 +16343,6 @@ f:com.intellij.refactoring.invertBoolean.InvertBooleanProcessor
|
||||
- com.intellij.refactoring.BaseRefactoringProcessor
|
||||
- <init>(com.intellij.psi.PsiElement,java.lang.String):V
|
||||
- findUsages():com.intellij.usageView.UsageInfo[]
|
||||
- preprocessUsages(com.intellij.openapi.util.Ref):Z
|
||||
c:com.intellij.refactoring.lang.ExtractIncludeDialog
|
||||
- com.intellij.openapi.ui.DialogWrapper
|
||||
- pf:myExtension:java.lang.String
|
||||
@@ -16450,7 +16448,7 @@ c:com.intellij.refactoring.memberPushDown.PushDownProcessor
|
||||
- p:getElementsToWrite(com.intellij.usageView.UsageViewDescriptor):java.util.Collection
|
||||
- p:getRefactoringId():java.lang.String
|
||||
- p:performRefactoring(com.intellij.usageView.UsageInfo[]):V
|
||||
- preprocessUsages(com.intellij.openapi.util.Ref):Z
|
||||
- p:preprocessUsages(com.intellij.openapi.util.Ref):Z
|
||||
- pushDownToClasses(com.intellij.usageView.UsageInfo[]):V
|
||||
- p:refreshElements(com.intellij.psi.PsiElement[]):V
|
||||
f:com.intellij.refactoring.memberPushDown.PushDownUsageViewDescriptor
|
||||
@@ -16551,7 +16549,7 @@ c:com.intellij.refactoring.move.moveClassesOrPackages.MoveDirectoryWithClassesPr
|
||||
- p:getTargetName():java.lang.String
|
||||
- p:performPsiSpoilingRefactoring():V
|
||||
- performRefactoring(com.intellij.usageView.UsageInfo[]):V
|
||||
- preprocessUsages(com.intellij.openapi.util.Ref):Z
|
||||
- p:preprocessUsages(com.intellij.openapi.util.Ref):Z
|
||||
f:com.intellij.refactoring.move.moveClassesOrPackages.MoveDirectoryWithClassesProcessor$TargetDirectoryWrapper
|
||||
- <init>(com.intellij.psi.PsiDirectory):V
|
||||
- <init>(com.intellij.psi.PsiDirectory,java.lang.String):V
|
||||
@@ -16615,7 +16613,7 @@ c:com.intellij.refactoring.move.moveFilesOrDirectories.MoveFilesOrDirectoriesPro
|
||||
- p:getRefactoringId():java.lang.String
|
||||
- p:performPsiSpoilingRefactoring():V
|
||||
- p:performRefactoring(com.intellij.usageView.UsageInfo[]):V
|
||||
- preprocessUsages(com.intellij.openapi.util.Ref):Z
|
||||
- p:preprocessUsages(com.intellij.openapi.util.Ref):Z
|
||||
- p:refreshElements(com.intellij.psi.PsiElement[]):V
|
||||
- p:retargetUsages(com.intellij.usageView.UsageInfo[],java.util.Map):V
|
||||
- p:shouldDisableAccessChecks():Z
|
||||
@@ -16772,7 +16770,7 @@ c:com.intellij.refactoring.rename.RenameProcessor
|
||||
- getNewNames():java.util.Collection
|
||||
- p:getRefactoringId():java.lang.String
|
||||
- hasNonCodeUsages():Z
|
||||
- isPreviewUsages(com.intellij.usageView.UsageInfo[]):Z
|
||||
- p:isPreviewUsages(com.intellij.usageView.UsageInfo[]):Z
|
||||
- isSearchInComments():Z
|
||||
- isSearchTextOccurrences():Z
|
||||
- p:performPsiSpoilingRefactoring():V
|
||||
@@ -17053,10 +17051,8 @@ f:com.intellij.refactoring.safeDelete.SafeDeleteProcessor
|
||||
- s:getDefaultInsideDeletedCondition(com.intellij.psi.PsiElement[]):com.intellij.openapi.util.Condition
|
||||
- getElements():com.intellij.psi.PsiElement[]
|
||||
- s:isInside(com.intellij.psi.PsiElement,com.intellij.psi.PsiElement):Z
|
||||
- isPreviewUsages(com.intellij.usageView.UsageInfo[]):Z
|
||||
- isSearchInCommentsAndStrings():Z
|
||||
- isSearchNonJava():Z
|
||||
- preprocessUsages(com.intellij.openapi.util.Ref):Z
|
||||
- setAfterRefactoringCallback(java.lang.Runnable):V
|
||||
- setSearchInCommentsAndStrings(Z):V
|
||||
- setSearchNonJava(Z):V
|
||||
|
||||
+1
-1
@@ -118,7 +118,7 @@ public abstract class ChangeSignatureProcessorBase extends BaseRefactoringProces
|
||||
|
||||
|
||||
@Override
|
||||
public boolean isPreviewUsages(UsageInfo @NotNull [] usages) {
|
||||
protected boolean isPreviewUsages(UsageInfo @NotNull [] usages) {
|
||||
for (ChangeSignatureUsageProcessor processor : ChangeSignatureUsageProcessor.EP_NAME.getExtensions()) {
|
||||
if (processor.shouldPreviewUsages(myChangeInfo, usages)) return true;
|
||||
}
|
||||
|
||||
+1
-1
@@ -108,7 +108,7 @@ public final class IntroduceParameterObjectProcessor<M extends PsiNamedElement,
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
final UsageInfo[] usageInfos = refUsages.get();
|
||||
MultiMap<PsiElement, @DialogMessage String> conflicts = new MultiMap<>();
|
||||
myDelegate.collectConflicts(conflicts, usageInfos, myMethod, myClassDescriptor);
|
||||
|
||||
+1
-1
@@ -63,7 +63,7 @@ public final class InvertBooleanProcessor extends BaseRefactoringProcessor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
final MultiMap<PsiElement, @DialogMessage String> conflicts = new MultiMap<>();
|
||||
final UsageInfo[] usageInfos = refUsages.get();
|
||||
myDelegate.findConflicts(usageInfos, conflicts);
|
||||
|
||||
+1
-1
@@ -90,7 +90,7 @@ public class PushDownProcessor<MemberInfo extends MemberInfoBase<Member>,
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(final @NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(final @NotNull Ref<UsageInfo[]> refUsages) {
|
||||
final MultiMap<PsiElement, @DialogMessage String> conflicts = new MultiMap<>();
|
||||
myDelegate.checkSourceClassConflicts(myPushDownData, conflicts);
|
||||
final UsageInfo[] usagesIn = refUsages.get();
|
||||
|
||||
+1
-1
@@ -123,7 +123,7 @@ public class MoveDirectoryWithClassesProcessor extends BaseRefactoringProcessor
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(final @NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(final @NotNull Ref<UsageInfo[]> refUsages) {
|
||||
final MultiMap<PsiElement, String> conflicts = new MultiMap<>();
|
||||
if (!ProgressManager.getInstance()
|
||||
.runProcessWithProgressSynchronously(() -> ReadAction.run(() -> collectConflicts(conflicts, refUsages)), RefactoringBundle.message("detecting.possible.conflicts"), true, myProject)) {
|
||||
|
||||
+1
-1
@@ -269,7 +269,7 @@ public class MoveFilesOrDirectoriesProcessor extends BaseRefactoringProcessor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
MultiMap<PsiElement, String> conflicts = new MultiMap<>();
|
||||
UsageInfo[] usages = refUsages.get();
|
||||
if (!ProgressManager.getInstance().runProcessWithProgressSynchronously(() -> ReadAction.run(() -> MoveFileHandler.detectConflicts(myElementsToMove, usages, myNewParent, conflicts)),
|
||||
|
||||
@@ -346,7 +346,7 @@ public class RenameProcessor extends BaseRefactoringProcessor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isPreviewUsages(UsageInfo @NotNull [] usages) {
|
||||
protected boolean isPreviewUsages(UsageInfo @NotNull [] usages) {
|
||||
return myForceShowPreview || super.isPreviewUsages(usages) || UsageViewUtil.reportNonRegularUsages(usages, myProject);
|
||||
}
|
||||
|
||||
|
||||
@@ -162,7 +162,7 @@ public final class SafeDeleteProcessor extends BaseRefactoringProcessor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
UsageInfo[] usages = refUsages.get();
|
||||
List<String> conflicts = new ArrayList<>();
|
||||
|
||||
@@ -340,7 +340,7 @@ public final class SafeDeleteProcessor extends BaseRefactoringProcessor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isPreviewUsages(UsageInfo @NotNull [] usages) {
|
||||
protected boolean isPreviewUsages(UsageInfo @NotNull [] usages) {
|
||||
if(myPreviewNonCodeUsages && UsageViewUtil.reportNonRegularUsages(usages, myProject)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
+1
-1
@@ -48,7 +48,7 @@ public class GrChangeSignatureProcessor extends ChangeSignatureProcessorBase {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
MultiMap<PsiElement, String> conflictDescriptions = new MultiMap<>();
|
||||
collectConflictsFromExtensions(refUsages, conflictDescriptions, myChangeInfo);
|
||||
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@ public class ExtractClosureFromClosureProcessor extends ExtractClosureProcessorB
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
UsageInfo[] usagesIn = refUsages.get();
|
||||
MultiMap<PsiElement, String> conflicts = new MultiMap<>();
|
||||
|
||||
|
||||
+1
-1
@@ -58,7 +58,7 @@ public class ExtractClosureFromMethodProcessor extends ExtractClosureProcessorBa
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
UsageInfo[] usagesIn = refUsages.get();
|
||||
MultiMap<PsiElement, String> conflicts = new MultiMap<>();
|
||||
final GrStatement[] statements = myHelper.getStatements();
|
||||
|
||||
+2
-2
@@ -63,7 +63,7 @@ public class GroovyInlineLocalProcessor extends BaseRefactoringProcessor {
|
||||
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
final MultiMap<PsiElement, String> conflicts = new MultiMap<>();
|
||||
final UsageInfo[] usages = refUsages.get();
|
||||
for (UsageInfo usage : usages) {
|
||||
@@ -74,7 +74,7 @@ public class GroovyInlineLocalProcessor extends BaseRefactoringProcessor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isPreviewUsages(UsageInfo @NotNull [] usages) {
|
||||
protected boolean isPreviewUsages(UsageInfo @NotNull [] usages) {
|
||||
for (UsageInfo usage : usages) {
|
||||
if (usage instanceof ClosureUsage) return true;
|
||||
}
|
||||
|
||||
+1
-1
@@ -106,7 +106,7 @@ public class GrIntroduceClosureParameterProcessor extends BaseRefactoringProcess
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
UsageInfo[] usagesIn = refUsages.get();
|
||||
MultiMap<PsiElement, String> conflicts = new MultiMap<>();
|
||||
|
||||
|
||||
+1
-1
@@ -87,7 +87,7 @@ public final class GrIntroduceParameterProcessor extends BaseRefactoringProcesso
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
UsageInfo[] usagesIn = refUsages.get();
|
||||
MultiMap<PsiElement, String> conflicts = new MultiMap<>();
|
||||
|
||||
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package com.intellij.execution.junit.codeInspection
|
||||
|
||||
import com.intellij.codeInsight.AnnotationUtil
|
||||
@@ -85,7 +85,7 @@ class JUnit5ConverterQuickFix : LocalQuickFix, BatchQuickFix {
|
||||
return ArrayUtil.mergeArrays(usages, descriptionUsages)
|
||||
}
|
||||
|
||||
override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean {
|
||||
protected override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean {
|
||||
val conflicts = MultiMap<PsiElement, String>()
|
||||
files.forEach { file ->
|
||||
file.classes.forEach { psiClass ->
|
||||
|
||||
+2
-2
@@ -119,7 +119,7 @@ class KotlinChangeSignatureProcessor(
|
||||
}
|
||||
}
|
||||
|
||||
override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean {
|
||||
protected override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean {
|
||||
val usageProcessors = ChangeSignatureUsageProcessor.EP_NAME.extensions
|
||||
|
||||
if (!usageProcessors.all { it.setupDefaultValues(myChangeInfo, refUsages, myProject) }) return false
|
||||
@@ -150,7 +150,7 @@ class KotlinChangeSignatureProcessor(
|
||||
return showConflicts(conflictDescriptions, usageArray)
|
||||
}
|
||||
|
||||
override fun isPreviewUsages(usages: Array<UsageInfo>): Boolean = isPreviewUsages
|
||||
protected override fun isPreviewUsages(usages: Array<UsageInfo>): Boolean = isPreviewUsages
|
||||
|
||||
override fun getCommandName() = commandName
|
||||
|
||||
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
|
||||
package org.jetbrains.kotlin.idea.refactoring.move
|
||||
|
||||
@@ -48,7 +48,7 @@ class KotlinAwareMoveFilesOrDirectoriesProcessor @JvmOverloads constructor(
|
||||
}
|
||||
}
|
||||
|
||||
override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean {
|
||||
protected override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean {
|
||||
val (conflicts, usages) = MoveConflictUsages.preprocess(refUsages)
|
||||
return showConflicts(conflicts, usages)
|
||||
}
|
||||
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
|
||||
package org.jetbrains.kotlin.idea.refactoring.move
|
||||
|
||||
@@ -42,7 +42,7 @@ class MoveToKotlinFileProcessor @JvmOverloads constructor(
|
||||
return MoveFilesWithDeclarationsViewDescriptor(arrayOf(sourceFile), targetDirectory)
|
||||
}
|
||||
|
||||
override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean {
|
||||
protected override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean {
|
||||
val (conflicts, usages) = MoveConflictUsages.preprocess(refUsages)
|
||||
return showConflicts(conflicts, usages)
|
||||
}
|
||||
|
||||
+1
-1
@@ -246,7 +246,7 @@ open class MoveKotlinDeclarationsProcessor(
|
||||
return UsageViewUtil.removeDuplicatedUsages(usages.toTypedArray())
|
||||
}
|
||||
|
||||
override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean {
|
||||
protected override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean {
|
||||
return showConflicts(conflicts, refUsages.get())
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
|
||||
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package org.jetbrains.kotlin.idea.refactoring.move.moveMethod
|
||||
|
||||
import com.intellij.ide.util.EditorHelper
|
||||
@@ -60,7 +60,7 @@ class MoveKotlinMethodProcessor(
|
||||
)
|
||||
}
|
||||
|
||||
override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean {
|
||||
protected override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean {
|
||||
return showConflicts(conflicts, refUsages.get())
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
|
||||
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
|
||||
package org.jetbrains.kotlin.idea.refactoring.pushDown
|
||||
|
||||
@@ -94,7 +94,7 @@ class KotlinPushDownProcessor(
|
||||
.toTypedArray()
|
||||
}
|
||||
|
||||
override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean {
|
||||
protected override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean {
|
||||
val usages = refUsages.get() ?: UsageInfo.EMPTY_ARRAY
|
||||
if (usages.isEmpty()) {
|
||||
val message = KotlinBundle.message("text.0.have.no.inheritors.warning", context.sourceClassDescriptor.renderForConflicts())
|
||||
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
|
||||
package org.jetbrains.kotlin.idea.refactoring.inline
|
||||
|
||||
@@ -80,7 +80,7 @@ abstract class AbstractKotlinInlineNamedDeclarationProcessor<TDeclaration : KtNa
|
||||
|
||||
open fun additionalPreprocessUsages(usages: Array<out UsageInfo>, conflicts: MultiMap<PsiElement, String>) = Unit
|
||||
|
||||
final override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean {
|
||||
protected final override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean {
|
||||
val usagesInfo = refUsages.get()
|
||||
if (inlineThisOnly) {
|
||||
val element = usagesInfo.singleOrNull()?.element
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@ open class KotlinChangeSignatureProcessor(project: Project, changeInfo: KotlinCh
|
||||
return KotlinUsagesViewDescriptor(method, RefactoringBundle.message("0.to.change.signature", UsageViewUtil.getType(method)))
|
||||
}
|
||||
|
||||
override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean {
|
||||
protected override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean {
|
||||
val usageProcessors = ChangeSignatureUsageProcessor.EP_NAME.extensions
|
||||
|
||||
if (!usageProcessors.all { it.setupDefaultValues(myChangeInfo, refUsages, myProject) }) return false
|
||||
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package org.jetbrains.kotlin.idea.k2.refactoring.move.processor
|
||||
|
||||
import com.intellij.openapi.actionSystem.ex.ActionUtil
|
||||
@@ -29,7 +29,7 @@ class K2ChangePackageRefactoringProcessor(private val descriptor: K2ChangePackag
|
||||
}.toTypedArray()
|
||||
}
|
||||
|
||||
override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean {
|
||||
protected override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean {
|
||||
val usages = refUsages.get()
|
||||
val conflicts = ActionUtil.underModalProgress(
|
||||
descriptor.project,
|
||||
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package org.jetbrains.kotlin.idea.k2.refactoring.move.processor
|
||||
|
||||
import com.intellij.ide.util.EditorHelper
|
||||
@@ -125,7 +125,7 @@ open class K2MoveDeclarationsRefactoringProcessor(
|
||||
|
||||
private val conflicts: MultiMap<PsiElement, String> = MultiMap<PsiElement, String>()
|
||||
|
||||
override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean {
|
||||
protected override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean {
|
||||
val usages = refUsages.get()
|
||||
ActionUtil.underModalProgress(
|
||||
operationDescriptor.project,
|
||||
|
||||
+1
-1
@@ -61,7 +61,7 @@ public class RemoveMiddlemanProcessor extends FixableUsagesRefactoringProcessor
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(final @NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(final @NotNull Ref<UsageInfo[]> refUsages) {
|
||||
final MultiMap<PsiElement, String> conflicts = new MultiMap<>();
|
||||
for (MemberInfo memberInfo : myDelegateMethodInfos) {
|
||||
if (memberInfo.isChecked() && memberInfo.isToAbstract()) {
|
||||
|
||||
+1
-1
@@ -171,7 +171,7 @@ public class WrapReturnValueProcessor extends FixableUsagesRefactoringProcessor
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preprocessUsages(final @NotNull Ref<UsageInfo[]> refUsages) {
|
||||
protected boolean preprocessUsages(final @NotNull Ref<UsageInfo[]> refUsages) {
|
||||
MultiMap<PsiElement, String> conflicts = new MultiMap<>();
|
||||
PsiClass existingClass = JavaPsiFacade.getInstance(myProject).findClass(myQualifiedName, GlobalSearchScope.allScope(myProject));
|
||||
if (myUseExistingClass) {
|
||||
|
||||
+1
-1
@@ -46,7 +46,7 @@ class PyInlineFunctionProcessor(project: Project,
|
||||
private val myGenerator = PyElementGenerator.getInstance(myProject)
|
||||
private var myRemoveDeclaration = !myInlineThisOnly && removeDeclaration
|
||||
|
||||
override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean {
|
||||
protected override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean {
|
||||
if (refUsages.isNull) return false
|
||||
val conflicts = MultiMap.create<PsiElement, String>()
|
||||
val usagesAndImports = refUsages.get()
|
||||
|
||||
Reference in New Issue
Block a user