mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
safe delete: allow multiple first level nodes (IDEA-135665)
This commit is contained in:
@@ -318,7 +318,7 @@ public class JavaSafeDeleteProcessor extends SafeDeleteProcessorDelegateBase {
|
||||
}
|
||||
}
|
||||
|
||||
if (delegatingParams.size() == 1) {
|
||||
if (!delegatingParams.isEmpty()) {
|
||||
final SafeDeleteParameterCallHierarchyUsageInfo parameterHierarchyUsageInfo = delegatingParams.get(0);
|
||||
if (ApplicationManager.getApplication().isUnitTestMode()) {
|
||||
result.addAll(delegatingParams);
|
||||
|
||||
+22
@@ -49,4 +49,26 @@ public class SafeDeleteParameterCallHierarchyUsageInfo extends SafeDeleteUsageIn
|
||||
public PsiMethod getCallerMethod() {
|
||||
return myCallerMethod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) return true;
|
||||
if (o == null || getClass() != o.getClass()) return false;
|
||||
if (!super.equals(o)) return false;
|
||||
|
||||
SafeDeleteParameterCallHierarchyUsageInfo info = (SafeDeleteParameterCallHierarchyUsageInfo)o;
|
||||
|
||||
if (!myCalledMethod.equals(info.myCalledMethod)) return false;
|
||||
if (!myCallerMethod.equals(info.myCallerMethod)) return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
int result = super.hashCode();
|
||||
result = 31 * result + myCalledMethod.hashCode();
|
||||
result = 31 * result + myCallerMethod.hashCode();
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,5 +4,9 @@ class Test {
|
||||
bar(i);
|
||||
}
|
||||
|
||||
void baz(int i) {
|
||||
bar(i);
|
||||
}
|
||||
|
||||
void bar(int <caret>i){}
|
||||
}
|
||||
@@ -4,5 +4,9 @@ class Test {
|
||||
bar();
|
||||
}
|
||||
|
||||
void baz() {
|
||||
bar();
|
||||
}
|
||||
|
||||
void bar(){}
|
||||
}
|
||||
Reference in New Issue
Block a user