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

[platform] unified stream processing for CanonicalPathMap, finally

Browse Source
This commit is contained in:
Roman Shevchenko
2016-08-24 15:58:23 +03:00
parent 40b043f2e9
commit 1b331cf247
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/CanonicalPathMap.java
+7 -16
View File
@@ -15,8 +15,6 @@
*/
package com.intellij.openapi.vfs.impl.local;
import com.intellij.concurrency.JobLauncher;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.io.FileSystemUtil;
@@ -27,7 +25,10 @@ import com.intellij.util.containers.MultiMap;
import org.jetbrains.annotations.NotNull;
import java.io.File;
import java.util.*;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Stream;
import static com.intellij.openapi.util.Pair.pair;
@@ -61,19 +62,9 @@ class CanonicalPathMap {
private static Map<String, String> resolvePaths(Collection<String> recursiveRoots, Collection<String> flatRoots) {
Map<String, String> result = ContainerUtil.newConcurrentMap();
if (ApplicationManager.getApplication() != null) {
List<String> roots = ContainerUtil.concat(Arrays.asList(recursiveRoots, flatRoots));
JobLauncher.getInstance().invokeConcurrentlyUnderProgress(roots, null, false, false, root -> {
ContainerUtil.putIfNotNull(root, FileSystemUtil.resolveSymLink(root), result);
return true;
});
}
else {
Stream.concat(recursiveRoots.stream(), flatRoots.stream())
.forEach(root -> ContainerUtil.putIfNotNull(root, FileSystemUtil.resolveSymLink(root), result));
}
Stream.concat(recursiveRoots.stream(), flatRoots.stream())
.parallel()
.forEach(root -> ContainerUtil.putIfNotNull(root, FileSystemUtil.resolveSymLink(root), result));
return result;
}