From 04ea24d67ed14c4e25e46b2d55153f194c22952c Mon Sep 17 00:00:00 2001 From: Sergei Vorobyov Date: Mon, 16 Mar 2026 14:59:49 +0100 Subject: [PATCH] IDEA-385795 [gradle|tooling] cleanup GradleBuildScriptClasspathModelBuilder: extract collectClasspathEntries() Separates classpath collection logic from model construction for clarity. GitOrigin-RevId: 38fd92ccc64196ce63985a77e1f5d27754d60ce3 --- ...GradleBuildScriptClasspathModelBuilder.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/plugins/gradle/tooling-extension-impl/src/com/intellij/gradle/toolingExtension/impl/model/buildScriptClasspathModel/GradleBuildScriptClasspathModelBuilder.java b/plugins/gradle/tooling-extension-impl/src/com/intellij/gradle/toolingExtension/impl/model/buildScriptClasspathModel/GradleBuildScriptClasspathModelBuilder.java index 8da58ffa4a65..07f1483ce74f 100644 --- a/plugins/gradle/tooling-extension-impl/src/com/intellij/gradle/toolingExtension/impl/model/buildScriptClasspathModel/GradleBuildScriptClasspathModelBuilder.java +++ b/plugins/gradle/tooling-extension-impl/src/com/intellij/gradle/toolingExtension/impl/model/buildScriptClasspathModel/GradleBuildScriptClasspathModelBuilder.java @@ -47,7 +47,18 @@ public class GradleBuildScriptClasspathModelBuilder extends AbstractModelBuilder DefaultGradleBuildScriptClasspathModel buildScriptClasspath = new DefaultGradleBuildScriptClasspathModel(); buildScriptClasspath.setGradleHomeDir(project.getGradle().getGradleHomeDir()); buildScriptClasspath.setGradleVersion(GradleVersion.current().getVersion()); + buildScriptClasspath.setClasspath(collectClasspathEntries(context, project)); + GradleBuildScriptClasspathCache.getInstance(context) + .setBuildScriptClasspathModel(project, buildScriptClasspath); + + return buildScriptClasspath; + } + + private static @NotNull List collectClasspathEntries( + @NotNull ModelBuilderContext context, + @NotNull Project project + ) { List classpathEntries = new ArrayList<>(); Project parentProject = project.getParent(); @@ -100,12 +111,7 @@ public class GradleBuildScriptClasspathModelBuilder extends AbstractModelBuilder } } - buildScriptClasspath.setClasspath(classpathEntries); - - GradleBuildScriptClasspathCache.getInstance(context) - .setBuildScriptClasspathModel(project, buildScriptClasspath); - - return buildScriptClasspath; + return classpathEntries; }