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

cleanup

Browse Source 
GitOrigin-RevId: fe30fec0b870561084a76d0eb750ab4d38c1160c
This commit is contained in:
Alexey Kudravtsev
2025-10-20 11:52:29 +00:00
committed by intellij-monorepo-bot
parent b52dd6a931
commit 4d1071ccc2
6 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/java/index/ConcurrentIndexTest.java
+6 -7
View File
@@ -24,6 +24,7 @@ import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.testFramework.BombedProgressIndicator;
import com.intellij.testFramework.SkipSlowTestLocally;
import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase;
import com.intellij.util.ConcurrencyUtil;
import com.intellij.util.ref.GCWatcher;
import org.jetbrains.annotations.NotNull;
@@ -82,7 +83,7 @@ public class ConcurrentIndexTest extends JavaCodeInsightFixtureTestCase {
}));
}
for (Future<?> future : futuresToWait) future.get();
ConcurrencyUtil.getAll(futuresToWait);
}
}
@@ -149,7 +150,7 @@ public class ConcurrentIndexTest extends JavaCodeInsightFixtureTestCase {
}
for (Future<?> future : futuresToWait) future.get();
ConcurrencyUtil.getAll(futuresToWait);
}
}
@@ -209,7 +210,7 @@ public class ConcurrentIndexTest extends JavaCodeInsightFixtureTestCase {
}));
}
for (Future<?> future : futuresToWait) future.get();
ConcurrencyUtil.getAll(futuresToWait);
}
}
@@ -253,12 +254,10 @@ public class ConcurrentIndexTest extends JavaCodeInsightFixtureTestCase {
public void run(@NotNull ProgressIndicator indicator) {
ReadAction.run(() -> {
assertNotNull(JavaPsiFacade.getInstance(project).findClass("Foo", GlobalSearchScope.allScope(project)));
});
});
}
}));
for (Future<?> future : futures) {
future.get();
}
ConcurrencyUtil.getAll(futures);
}
}
}
jps/jps-builders/src/org/jetbrains/jps/cache/loader/JpsCompilationOutputLoader.java
Vendored
+2 -3
View File
@@ -7,6 +7,7 @@ import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.io.NioFiles;
import com.intellij.util.ArrayUtil;
import com.intellij.util.ConcurrencyUtil;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.io.ZipUtil;
import org.jetbrains.annotations.ApiStatus;
@@ -91,9 +92,7 @@ public final class JpsCompilationOutputLoader implements JpsOutputLoader<List<Ou
myContext.sendDescriptionStatusMessage(JpsBuildBundle.message("progress.text.extracting.downloaded.results"));
List<Future<?>> futureList = ContainerUtil.map(outputLoadResults, loadResult ->
EXECUTOR_SERVICE.submit(new UnzipOutputTask(result, loadResult, myContext)));
for (Future<?> future : futureList) {
future.get();
}
ConcurrencyUtil.getAll(futureList);
myTmpFolderToModuleName = result;
LOG.info("Unzip compilation output took: " + (System.currentTimeMillis() - start));
return LoaderStatus.COMPLETE;
jps/jps-builders/src/org/jetbrains/jps/incremental/dependencies/DependencyResolvingBuilder.java
+2 -1
View File
@@ -9,6 +9,7 @@ import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.io.FileUtilRt;
import com.intellij.platform.jps.model.resolver.JpsDependencyResolverConfiguration;
import com.intellij.platform.jps.model.resolver.JpsDependencyResolverConfigurationService;
import com.intellij.util.ConcurrencyUtil;
import com.intellij.util.SmartList;
import com.intellij.util.SystemProperties;
import com.intellij.util.containers.CollectionFactory;
@@ -226,7 +227,7 @@ public final class DependencyResolvingBuilder extends ModuleLevelBuilder {
ExecutorService executorService = Executors.newFixedThreadPool(parallelism);
try {
List<Future<?>> futures = ContainerUtil.map(libs, lib -> executorService.submit(() -> resolveAction.accept(lib)));
for (Future<?> future : futures) future.get();
ConcurrencyUtil.getAll(futures);
}
finally {
executorService.shutdown();
platform/platform-tests/testSrc/com/intellij/openapi/vfs/newvfs/impl/PersistentFS_FindFilesTest.java
+2 -3
View File
@@ -14,6 +14,7 @@ import com.intellij.openapi.vfs.newvfs.persistent.PersistentFS;
import com.intellij.openapi.vfs.newvfs.persistent.PersistentFSImpl;
import com.intellij.testFramework.junit5.TestApplication;
import com.intellij.testFramework.utils.vfs.CheckVFSHealthExtension;
import com.intellij.util.ConcurrencyUtil;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.BeforeAll;
@@ -312,9 +313,7 @@ public class PersistentFS_FindFilesTest {
try {
List<? extends Future<?>> futures = ContainerUtil.map(tasks, task -> pool.submit(task));
for (Future<?> future : futures) {
future.get();
}
ConcurrencyUtil.getAll(futures);
}
finally {
pool.shutdown();
platform/platform-tests/testSrc/com/intellij/openapi/vfs/newvfs/persistent/namecache/FileNameCacheMicroBenchmark.java
+2 -3
View File
@@ -7,6 +7,7 @@ import com.intellij.openapi.vfs.newvfs.persistent.FSRecords;
import com.intellij.testFramework.LightProjectDescriptor;
import com.intellij.testFramework.fixtures.IdeaTestFixture;
import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory;
import com.intellij.util.ConcurrencyUtil;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.longs.LongArrayList;
@@ -191,9 +192,7 @@ public final class FileNameCacheMicroBenchmark {
futures.add(ApplicationManager.getApplication().executeOnPooledThread(
() -> testIteration.doTest(finalI, ids, threadRandom, queryCount)));
}
for (Future<?> future : futures) {
future.get();
}
ConcurrencyUtil.getAll(futures);
return System.currentTimeMillis() - start;
}
platform/util/testSrc/com/intellij/util/lang/test/UrlClassLoaderTest.java
+2 -3
View File
@@ -5,6 +5,7 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.platform.ijent.community.buildConstants.IjentBuildScriptsConstantsKt;
import com.intellij.testFramework.PlatformTestUtil;
import com.intellij.testFramework.rules.TempDirectory;
import com.intellij.util.ConcurrencyUtil;
import com.intellij.util.ExceptionUtil;
import com.intellij.util.ThrowableConsumer;
import com.intellij.util.lang.ClassPath;
@@ -121,9 +122,7 @@ public class UrlClassLoaderTest {
}));
}
for (Future<?> future : futures) {
future.get();
}
ConcurrencyUtil.getAll(futures);
}
}
finally {