safe delete: allow multiple first level nodes (IDEA-135665)

This commit is contained in:
Anna Kozlova
2015-01-27 20:00:38 +03:00
parent c66c509cbd
commit 5025e94962
4 changed files with 31 additions and 1 deletions
@@ -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);
@@ -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(){}
}