MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-18 12:31:26 +07:00
Code Issues Packages Projects Releases Wiki Activity

Java: improve conflict message

Browse Source 
GitOrigin-RevId: 7e498db020a15cb8bb35e37a3725abfa00a2c4a3
This commit is contained in:
Bas Leijdekkers
2023-04-25 15:35:31 +02:00
committed by intellij-monorepo-bot
parent 7c6adf32b9
commit 104e8933b7
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/java-impl-refactorings/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java
View File

@@ -1279,7 +1279,7 @@ public class JavaChangeSignatureUsageProcessor implements ChangeSignatureUsagePr
this.myChangeInfo = changeInfo;
}
public MultiMap<PsiElement, @DialogMessage String> findConflicts(Ref<UsageInfo[]> refUsages) {
private MultiMap<PsiElement, @DialogMessage String> findConflicts(Ref<UsageInfo[]> refUsages) {
MultiMap<PsiElement, @DialogMessage String> conflictDescriptions = new MultiMap<>();
final PsiMethod prototype = addMethodConflicts(conflictDescriptions);
Set<UsageInfo> usagesSet = ContainerUtil.newHashSet(refUsages.get());
@@ -1333,7 +1333,13 @@ public class JavaChangeSignatureUsageProcessor implements ChangeSignatureUsagePr
for (int i = 0; i < toRemove.length; i++) {
if (toRemove[i] && i < args.length) {
if (RemoveUnusedVariableUtil.checkSideEffects(args[i], null, new ArrayList<>())) {
conflictDescriptions.putValue(args[i], JavaRefactoringBundle.message("safe.delete.parameter.usage.warning", myChangeInfo.getOldParameterNames()[i]));
final PsiParameter parameter = myChangeInfo.getMethod().getParameterList().getParameter(i);
if (parameter != null) {
String message =
JavaRefactoringBundle.message("safe.delete.parameter.usage.warning",
RefactoringUIUtil.getDescription(parameter, true));
conflictDescriptions.putValue(args[i], StringUtil.capitalize(message));
}
}
}
}