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

null checks (IDEA-CR-21943)

Browse Source
This commit is contained in:
Anna Kozlova
2017-06-16 19:14:28 +03:00
parent 58475809df
commit af82fb8e95
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveDirectoryWithClassesProcessor.java
+3 -1
View File
@@ -102,7 +102,7 @@ public class MoveDirectoryWithClassesProcessor extends BaseRefactoringProcessor
}
private Set<PsiFile> getPsiFiles() {
return myFilesToMove.keySet().stream().map(myManager::findFile).collect(Collectors.toSet());
return myFilesToMove.keySet().stream().map(myManager::findFile).filter(Objects::nonNull).collect(Collectors.toSet());
}
protected String getTargetName() {
@@ -124,6 +124,7 @@ public class MoveDirectoryWithClassesProcessor extends BaseRefactoringProcessor
final MultiMap<PsiElement, String> conflicts = new MultiMap<>();
for (VirtualFile vFile : myFilesToMove.keySet()) {
PsiFile file = myManager.findFile(vFile);
if (file == null) continue;
try {
myFilesToMove.get(vFile).checkMove(file);
}
@@ -163,6 +164,7 @@ public class MoveDirectoryWithClassesProcessor extends BaseRefactoringProcessor
final Map<PsiElement, PsiElement> oldToNewElementsMapping = new HashMap<>();
for (VirtualFile virtualFile : myFilesToMove.keySet()) {
PsiFile file = myManager.findFile(virtualFile);
if (file == null) continue;
for (MoveDirectoryWithClassesHelper helper : MoveDirectoryWithClassesHelper.findAll()) {
helper.beforeMove(file);
}