Skip to content

Localizing refactoring conflicts gathering (part 3) #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VISTALL merged 1 commit into from
Dec 8, 2025
Merged

Localizing refactoring conflicts gathering (part 3) #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 41 additions & 52 deletions ...ain/java/com/intellij/java/impl/ig/classlayout/ProtectedMemberInFinalClassInspection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import com.intellij.java.language.impl.psi.impl.source.resolve.JavaResolveUtil;
import com.intellij.java.language.psi.*;
import com.intellij.java.language.psi.search.searches.SuperMethodsSearch;
import com.intellij.java.language.psi.util.MethodSignatureBackedByPsiMethod;
import com.siyeh.ig.BaseInspection;
import com.siyeh.ig.BaseInspectionVisitor;
import com.siyeh.ig.InspectionGadgetsFix;
Expand All @@ -29,7 +28,6 @@
import consulo.annotation.component.ExtensionImpl;
import consulo.application.AccessToken;
import consulo.application.WriteAction;
import consulo.application.util.function.Processor;
import consulo.application.util.query.Query;
import consulo.language.editor.inspection.ProblemDescriptor;
import consulo.language.editor.refactoring.localize.RefactoringLocalize;
Expand Down Expand Up @@ -94,59 +92,49 @@ public void doFix(Project project, ProblemDescriptor descriptor) throws Incorrec
if (modifierList == null) {
return;
}
final MultiMap<PsiElement, String> conflicts = new MultiMap();
final MultiMap<PsiElement, LocalizeValue> conflicts = new MultiMap<>();
if (member instanceof PsiMethod) {
final PsiMethod method = (PsiMethod) member;
SuperMethodsSearch.search(method, method.getContainingClass(), true, false).forEach(
new Processor<MethodSignatureBackedByPsiMethod>() {
@Override
public boolean process(MethodSignatureBackedByPsiMethod methodSignature) {
final PsiMethod superMethod = methodSignature.getMethod();
conflicts.putValue(
superMethod,
InspectionGadgetsLocalize.zeroWillHaveIncompatibleAccessPrivilegesWithSuper1(
RefactoringUIUtil.getDescription(method, false),
RefactoringUIUtil.getDescription(superMethod, true)
).get()
);
return true;
}
});
OverridingMethodsSearch.search(method).forEach(new Processor<PsiMethod>() {
@Override
public boolean process(PsiMethod overridingMethod) {
conflicts.putValue(
overridingMethod,
InspectionGadgetsLocalize.zeroWillNoLongerBeVisibleFromOverriding1(
RefactoringUIUtil.getDescription(method, false),
RefactoringUIUtil.getDescription(overridingMethod, true)
).get()
);
return false;
}
SuperMethodsSearch.search(method, method.getContainingClass(), true, false).forEach(methodSignature -> {
PsiMethod superMethod = methodSignature.getMethod();
conflicts.putValue(
superMethod,
InspectionGadgetsLocalize.zeroWillHaveIncompatibleAccessPrivilegesWithSuper1(
RefactoringUIUtil.getDescription(method, false),
RefactoringUIUtil.getDescription(superMethod, true)
)
);
return true;
});
OverridingMethodsSearch.search(method).forEach(overridingMethod -> {
conflicts.putValue(
overridingMethod,
InspectionGadgetsLocalize.zeroWillNoLongerBeVisibleFromOverriding1(
RefactoringUIUtil.getDescription(method, false),
RefactoringUIUtil.getDescription(overridingMethod, true)
)
);
return false;
});
}
final PsiModifierList modifierListCopy = (PsiModifierList) modifierList.copy();
modifierListCopy.setModifierProperty(PsiModifier.PRIVATE, true);
final Query<PsiReference> search = ReferencesSearch.search(member, member.getResolveScope());
search.forEach(new Processor<PsiReference>() {
@Override
public boolean process(PsiReference reference) {
final PsiElement element = reference.getElement();
if (!JavaResolveUtil.isAccessible(member, member.getContainingClass(), modifierListCopy, element, null, null)) {
final PsiElement context =
PsiTreeUtil.getParentOfType(element, PsiMethod.class, PsiField.class, PsiClass.class, PsiFile.class);
conflicts.putValue(
element,
RefactoringLocalize.zeroWith1VisibilityIsNotAccessibleFrom2(
RefactoringUIUtil.getDescription(member, false),
PsiBundle.visibilityPresentation(PsiModifier.PRIVATE),
RefactoringUIUtil.getDescription(context, true)
).get()
);
}
return true;
search.forEach(reference -> {
PsiElement element1 = reference.getElement();
if (!JavaResolveUtil.isAccessible(member, member.getContainingClass(), modifierListCopy, element1, null, null)) {
PsiElement context =
PsiTreeUtil.getParentOfType(element1, PsiMethod.class, PsiField.class, PsiClass.class, PsiFile.class);
conflicts.putValue(
element1,
RefactoringLocalize.zeroWith1VisibilityIsNotAccessibleFrom2(
RefactoringUIUtil.getDescription(member, false),
PsiBundle.visibilityPresentation(PsiModifier.PRIVATE),
RefactoringUIUtil.getDescription(context, true)
)
);
}
return true;
});
final boolean conflictsDialogOK;
if (conflicts.isEmpty()) {
Expand All @@ -156,18 +144,19 @@ public boolean process(PsiReference reference) {
if (!isOnTheFly()) {
return;
}
final ConflictsDialog conflictsDialog = new ConflictsDialog(member.getProject(), conflicts, new Runnable() {
@Override
public void run() {
final AccessToken token = WriteAction.start();
ConflictsDialog conflictsDialog = new ConflictsDialog(
member.getProject(),
conflicts,
(Runnable) () -> {
AccessToken token = WriteAction.start();
try {
modifierList.setModifierProperty(PsiModifier.PRIVATE, true);
}
finally {
token.finish();
}
}
});
);
conflictsDialog.show();
conflictsDialogOK = conflictsDialog.isOK();
}
Expand Down
28 changes: 19 additions & 9 deletions ...in/java/com/intellij/java/impl/ipp/interfacetoclass/ConvertInterfaceToClassIntention.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ protected void processIntention(@Nonnull PsiElement element) throws IncorrectOpe
final PsiClass anInterface = (PsiClass) element.getParent();
final SearchScope searchScope = anInterface.getUseScope();
final Query<PsiClass> query = ClassInheritorsSearch.search(anInterface, searchScope, false);
final MultiMap<PsiElement, String> conflicts = new MultiMap();
final MultiMap<PsiElement, LocalizeValue> conflicts = new MultiMap<>();
query.forEach(new Processor<PsiClass>() {
@Override
public boolean process(PsiClass aClass) {
Expand All @@ -125,7 +125,14 @@ public boolean process(PsiClass aClass) {
if (referenceElements.length > 0) {
final PsiElement target = referenceElements[0].resolve();
if (target != null) {
conflicts.putValue(aClass, IntentionPowerPackLocalize.zeroAlreadyExtends1AndWillNotCompileAfterConverting2ToAClass(RefactoringUIUtil.getDescription(aClass, true), RefactoringUIUtil.getDescription(target, true), RefactoringUIUtil.getDescription(anInterface, false)).get());
conflicts.putValue(
aClass,
IntentionPowerPackLocalize.zeroAlreadyExtends1AndWillNotCompileAfterConverting2ToAClass(
RefactoringUIUtil.getDescription(aClass, true),
RefactoringUIUtil.getDescription(target, true),
RefactoringUIUtil.getDescription(anInterface, false)
)
);
}
}
return true;
Expand All @@ -136,18 +143,19 @@ public boolean process(PsiClass aClass) {
conflictsDialogOK = true;
}
else {
final ConflictsDialog conflictsDialog = new ConflictsDialog(anInterface.getProject(), conflicts, new Runnable() {
@Override
public void run() {
final AccessToken token = WriteAction.start();
ConflictsDialog conflictsDialog = new ConflictsDialog(
anInterface.getProject(),
conflicts,
() -> {
AccessToken token = WriteAction.start();
try {
convertInterfaceToClass(anInterface);
}
finally {
token.finish();
}
}
});
);
conflictsDialog.show();
conflictsDialogOK = conflictsDialog.isOK();
}
Expand Down Expand Up @@ -205,8 +213,10 @@ private static boolean moveSubClassImplementsToExtends(PsiClass oldInterface) th
return true;
}

private static void moveReference(@Nonnull PsiReferenceList source, @Nullable PsiReferenceList target,
@Nonnull PsiJavaCodeReferenceElement reference) throws IncorrectOperationException {
private static void moveReference(
@Nonnull PsiReferenceList source, @Nullable PsiReferenceList target,
@Nonnull PsiJavaCodeReferenceElement reference
) throws IncorrectOperationException {
final PsiJavaCodeReferenceElement[] implementsReferences = source.getReferenceElements();
final String qualifiedName = reference.getQualifiedName();
for (PsiJavaCodeReferenceElement implementsReference : implementsReferences) {
Expand Down
52 changes: 40 additions & 12 deletions plugin/src/main/java/com/intellij/java/impl/ipp/modifiers/ModifierIntention.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import consulo.language.psi.search.ReferencesSearch;
import consulo.language.psi.util.PsiTreeUtil;
import consulo.language.util.IncorrectOperationException;
import consulo.localize.LocalizeValue;
import consulo.util.collection.MultiMap;
import consulo.util.io.FileUtil;
import jakarta.annotation.Nonnull;
Expand Down Expand Up @@ -64,15 +65,17 @@ protected final void processIntention(@Nonnull PsiElement element) throws Incorr
if (modifierList == null) {
return;
}
final MultiMap<PsiElement, String> conflicts = checkForConflicts(member);
MultiMap<PsiElement, LocalizeValue> conflicts = checkForConflicts(member);
final boolean conflictsDialogOK;
if (conflicts.isEmpty()) {
conflictsDialogOK = true;
}
else {
final ConflictsDialog conflictsDialog = new ConflictsDialog(member.getProject(), conflicts, () -> {
WriteAction.run(() -> modifierList.setModifierProperty(getModifier(), true));
});
ConflictsDialog conflictsDialog = new ConflictsDialog(
member.getProject(),
conflicts,
() -> WriteAction.run(() -> modifierList.setModifierProperty(getModifier(), true))
);
conflictsDialog.show();
conflictsDialogOK = conflictsDialog.isOK();
}
Expand All @@ -82,7 +85,7 @@ protected final void processIntention(@Nonnull PsiElement element) throws Incorr
}
}

private MultiMap<PsiElement, String> checkForConflicts(@Nonnull final PsiMember member) {
private MultiMap<PsiElement, LocalizeValue> checkForConflicts(@Nonnull PsiMember member) {
if (member instanceof PsiClass && getModifier().equals(PsiModifier.PUBLIC)) {
final PsiClass aClass = (PsiClass) member;
final PsiElement parent = aClass.getParent();
Expand All @@ -95,30 +98,55 @@ private MultiMap<PsiElement, String> checkForConflicts(@Nonnull final PsiMember
if (name.equals(className)) {
return MultiMap.empty();
}
final MultiMap<PsiElement, String> conflicts = new MultiMap();
conflicts.putValue(aClass, IntentionPowerPackLocalize.zeroIsDeclaredIn1ButWhenPublicShouldBeDeclaredInAFileNamed2(RefactoringUIUtil.getDescription(aClass, false), RefactoringUIUtil.getDescription(javaFile, false), CommonRefactoringUtil.htmlEmphasize(className + ".java")).get());
MultiMap<PsiElement, LocalizeValue> conflicts = new MultiMap<>();
conflicts.putValue(
aClass,
IntentionPowerPackLocalize.zeroIsDeclaredIn1ButWhenPublicShouldBeDeclaredInAFileNamed2(
RefactoringUIUtil.getDescription(aClass, false),
RefactoringUIUtil.getDescription(javaFile, false),
CommonRefactoringUtil.htmlEmphasize(className + ".java")
)
);
return conflicts;
}
final PsiModifierList modifierList = member.getModifierList();
if (modifierList == null || modifierList.hasModifierProperty(PsiModifier.PRIVATE)) {
return MultiMap.empty();
}
final MultiMap<PsiElement, String> conflicts = new MultiMap();
MultiMap<PsiElement, LocalizeValue> conflicts = new MultiMap<>();
if (member instanceof PsiMethod) {
final PsiMethod method = (PsiMethod) member;
SuperMethodsSearch.search(method, method.getContainingClass(), true, false).forEach(methodSignature -> {
final PsiMethod superMethod = methodSignature.getMethod();
if (!hasCompatibleVisibility(superMethod, true)) {
conflicts.putValue(superMethod, IntentionPowerPackLocalize.zeroWillHaveIncompatibleAccessPrivilegesWithSuper1(RefactoringUIUtil.getDescription(method, false), RefactoringUIUtil.getDescription(superMethod, true)).get());
conflicts.putValue(
superMethod,
IntentionPowerPackLocalize.zeroWillHaveIncompatibleAccessPrivilegesWithSuper1(
RefactoringUIUtil.getDescription(method, false),
RefactoringUIUtil.getDescription(superMethod, true)
)
);
}
return true;
});
OverridingMethodsSearch.search(method).forEach(overridingMethod -> {
if (!isVisibleFromOverridingMethod(method, overridingMethod)) {
conflicts.putValue(overridingMethod, IntentionPowerPackLocalize.zeroWillNoLongerBeVisibleFromOverriding1(RefactoringUIUtil.getDescription(method, false), RefactoringUIUtil.getDescription(overridingMethod, true)).get());
conflicts.putValue(
overridingMethod,
IntentionPowerPackLocalize.zeroWillNoLongerBeVisibleFromOverriding1(
RefactoringUIUtil.getDescription(method, false),
RefactoringUIUtil.getDescription(overridingMethod, true)
)
);
}
else if (!hasCompatibleVisibility(overridingMethod, false)) {
conflicts.putValue(overridingMethod, IntentionPowerPackLocalize.zeroWillHaveIncompatibleAccessPrivilegesWithOverriding1(RefactoringUIUtil.getDescription(method, false), RefactoringUIUtil.getDescription(overridingMethod, true)).get());
conflicts.putValue(
overridingMethod,
IntentionPowerPackLocalize.zeroWillHaveIncompatibleAccessPrivilegesWithOverriding1(
RefactoringUIUtil.getDescription(method, false),
RefactoringUIUtil.getDescription(overridingMethod, true)
)
);
}
return false;
});
Expand All @@ -141,7 +169,7 @@ else if (!hasCompatibleVisibility(overridingMethod, false)) {
RefactoringUIUtil.getDescription(member, false),
PsiBundle.visibilityPresentation(getModifier()),
RefactoringUIUtil.getDescription(context, true)
).get()
)
);
return true;
});
Expand Down
Loading
Loading