MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-07 22:09:38 +07:00
Code Issues Packages Projects Releases Wiki Activity

[Gradle|Sync] fix: reduced number of calls for the Gradle build environment

Browse Source 
GitOrigin-RevId: a9492ff534aceba76e9b285a16ba262aca36b20c
This commit is contained in:
Sergei Vorobyov
2024-02-21 17:25:48 +01:00
committed by intellij-monorepo-bot
parent 854976bf30
commit 3a4753aa2e
1 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
plugins/gradle/tooling-extension-impl/src/com/intellij/gradle/toolingExtension/impl/modelAction/GradleModelFetchAction.java
View File

@@ -190,12 +190,12 @@ public class GradleModelFetchAction implements BuildAction<AllModels>, Serializa
GradleBuild mainGradleBuild = telemetry.callWithSpan("GetMainGradleBuild", __ ->
controller.getBuildModel()
);
Collection<? extends GradleBuild> nestedGradleBuilds = telemetry.callWithSpan("GetNestedGradleBuilds", __ ->
getNestedBuilds(controller, mainGradleBuild)
);
BuildEnvironment buildEnvironment = telemetry.callWithSpan("GetBuildEnvironment", __ ->
controller.getModel(BuildEnvironment.class)
);
Collection<? extends GradleBuild> nestedGradleBuilds = telemetry.callWithSpan("GetNestedGradleBuilds", __ ->
getNestedBuilds(buildEnvironment, mainGradleBuild)
);
ModelConverter modelConverter = telemetry.callWithSpan("GetToolingModelConverter", __ ->
getToolingModelConverter(controller, telemetry)
);
@@ -209,12 +209,8 @@ public class GradleModelFetchAction implements BuildAction<AllModels>, Serializa
myAllModels = allModels;
}
private static Collection<? extends GradleBuild> getNestedBuilds(@NotNull BuildController controller, @NotNull GradleBuild build) {
BuildEnvironment environment = controller.getModel(BuildEnvironment.class);
if (environment == null) {
return Collections.emptySet();
}
GradleVersion gradleVersion = GradleVersion.version(environment.getGradle().getGradleVersion());
private static Collection<? extends GradleBuild> getNestedBuilds(@NotNull BuildEnvironment buildEnvironment, @NotNull GradleBuild build) {
GradleVersion gradleVersion = GradleVersion.version(buildEnvironment.getGradle().getGradleVersion());
Set<String> processedBuildsPaths = new HashSet<>();
Set<GradleBuild> nestedBuilds = new LinkedHashSet<>();
String rootBuildPath = build.getBuildIdentifier().getRootDir().getPath();
@@ -238,17 +234,15 @@ public class GradleModelFetchAction implements BuildAction<AllModels>, Serializa
* @return builds to be imported by IDEA. Before Gradle 8.0 - included builds, 8.0 and later - included and buildSrc builds
*/
private static DomainObjectSet<? extends GradleBuild> getEditableBuilds(@NotNull GradleBuild build, @NotNull GradleVersion version) {
if (GradleVersionUtil.isGradleAtLeast(version, "8.0")) {
DomainObjectSet<? extends GradleBuild> builds = build.getEditableBuilds();
if (builds.isEmpty()) {
return build.getIncludedBuilds();
}
else {
return builds;
}
if (GradleVersionUtil.isGradleOlderThan(version, "8.0")) {
return build.getIncludedBuilds();
}
DomainObjectSet<? extends GradleBuild> builds = build.getEditableBuilds();
if (builds.isEmpty()) {
return build.getIncludedBuilds();
}
else {
return build.getIncludedBuilds();
return builds;
}
}