From e29125ee7b22fcd98eea5999104249feb6c110d7 Mon Sep 17 00:00:00 2001 From: Nikita Skvortsov Date: Thu, 17 May 2018 17:36:16 +0300 Subject: [PATCH] do not walk project dependencies if not needed --- .../util/resolve/ArtifactQueryResolver.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/resolve/ArtifactQueryResolver.java b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/resolve/ArtifactQueryResolver.java index 0c87f515f771..43f50e560650 100644 --- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/resolve/ArtifactQueryResolver.java +++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/resolve/ArtifactQueryResolver.java @@ -137,15 +137,17 @@ class ArtifactQueryResolver { fileDeps.remove(artifact.getFile()); } - for (ProjectDependency dep : projectDepsToFilter) { - Set depFiles = DependencyResolverImpl.getTargetConfiguration(dep).getAllArtifacts().getFiles().getFiles(); + if (!fileDeps.isEmpty()) { + for (ProjectDependency dep : projectDepsToFilter) { + Set depFiles = DependencyResolverImpl.getTargetConfiguration(dep).getAllArtifacts().getFiles().getFiles(); - final Set intersection = new LinkedHashSet(Sets.intersection(fileDeps, depFiles)); - if (!intersection.isEmpty()) { - DefaultFileCollectionDependency fileCollectionDependency = new DefaultFileCollectionDependency(intersection); - fileCollectionDependency.setScope(myScope); - result.add(fileCollectionDependency); - fileDeps.removeAll(intersection); + final Set intersection = new LinkedHashSet(Sets.intersection(fileDeps, depFiles)); + if (!intersection.isEmpty()) { + DefaultFileCollectionDependency fileCollectionDependency = new DefaultFileCollectionDependency(intersection); + fileCollectionDependency.setScope(myScope); + result.add(fileCollectionDependency); + fileDeps.removeAll(intersection); + } } } @@ -158,7 +160,6 @@ class ArtifactQueryResolver { return result; } - @NotNull protected List> additionalArtifactsTypes() { List> artifactTypes = new ArrayList>();