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

apply SSR cleanup

Browse Source
This commit is contained in:
Alexey Kudravtsev
2018-11-09 16:09:02 +03:00
parent 970eed743a
commit ec88df0239
61 changed files with 162 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/backwardRefs/DirtyScopeHolder.java
+3 -3
View File
@@ -20,7 +20,8 @@ import com.intellij.openapi.roots.ModuleRootEvent;
import com.intellij.openapi.roots.ModuleRootListener;
import com.intellij.openapi.util.UserDataHolderBase;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vfs.*;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileManager;
import com.intellij.openapi.vfs.newvfs.BulkFileListener;
import com.intellij.openapi.vfs.newvfs.events.*;
import com.intellij.psi.PsiDocumentManager;
@@ -41,7 +42,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.function.BiConsumer;
import java.util.stream.Collectors;
@SuppressWarnings("WeakerAccess")
public class DirtyScopeHolder extends UserDataHolderBase implements BulkFileListener {
@@ -128,7 +128,7 @@ public class DirtyScopeHolder extends UserDataHolderBase implements BulkFileList
return null;
}
final ModuleManager moduleManager = ModuleManager.getInstance(myService.getProject());
return myCompilationAffectedModules.stream().map(moduleManager::findModuleByName).collect(Collectors.toList());
return ContainerUtil.map(myCompilationAffectedModules, moduleManager::findModuleByName);
});
compilationFinished(() -> {
if (compiledModules == null) return;
java/compiler/impl/src/com/intellij/compiler/inspection/ChangeSuperClassFix.java
+2 -2
View File
@@ -196,7 +196,7 @@ public class ChangeSuperClassFix implements LocalQuickFix, HighPriorityAction {
String newClassName,
Project project) {
if (ApplicationManager.getApplication().isUnitTestMode()) {
return candidates.stream().map(c -> (PsiMethod)c.getMember()).collect(Collectors.toList());
return ContainerUtil.map(candidates, c -> (PsiMethod)c.getMember());
}
MemberSelectionPanel panel =
new MemberSelectionPanel("<html>Choose members to delete since they are already defined in <b>" + newClassName + "</b>",
@@ -216,7 +216,7 @@ public class ChangeSuperClassFix implements LocalQuickFix, HighPriorityAction {
}
};
return dlg.showAndGet()
? panel.getTable().getSelectedMemberInfos().stream().map(info -> (PsiMethod)info.getMember()).collect(Collectors.toList())
? ContainerUtil.map(panel.getTable().getSelectedMemberInfos(), info -> (PsiMethod)info.getMember())
: Collections.emptyList();
}
}