MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

EA-83586 - NPE: JavaSafeDeleteProcessor.findConflicts

Browse Source
This commit is contained in:
Anna Kozlova
2016-06-06 17:52:24 +03:00
parent 0b4390ed9e
commit b32ebc4f36
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java
+4 -1
View File
@@ -267,7 +267,10 @@ public class JavaSafeDeleteProcessor extends SafeDeleteProcessorDelegateBase {
if (methodRefFound != null) {
Collection<String> result = new ArrayList<>();
result.add(methodRefFound);
result.addAll(super.findConflicts(element, elements, usages));
final Collection<String> conflicts = super.findConflicts(element, elements, usages);
if (conflicts != null) {
result.addAll(conflicts);
}
return result;
}
return super.findConflicts(element, elements, usages);
platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteProcessorDelegateBase.java
+1
View File
@@ -43,6 +43,7 @@ public abstract class SafeDeleteProcessorDelegateBase implements SafeDeleteProce
return null;
}
@Nullable
public Collection<String> findConflicts(PsiElement element, PsiElement[] elements, UsageInfo[] usages) {
return findConflicts(element, elements);
}