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

[Gradle|Exec] cleanup: simplify the GradleProjectResolver#resolveProjectInfo function

Browse Source 
Issues IDEA-363359, IDEA-344664

GitOrigin-RevId: 856fa4b2e45181c7cd0beb4cd6d2d6497a6e3c7a
This commit is contained in:
Sergei Vorobyov
2024-11-26 11:08:22 +00:00
committed by intellij-monorepo-bot
parent 130b157e33
commit cf02931f5b
1 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java
+16 -27
View File
@@ -42,10 +42,7 @@ import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.StatusCode;
import io.opentelemetry.context.Scope;
import org.gradle.api.ProjectConfigurationException;
import org.gradle.tooling.BuildActionFailureException;
import org.gradle.tooling.CancellationTokenSource;
import org.gradle.tooling.GradleConnector;
import org.gradle.tooling.ProjectConnection;
import org.gradle.tooling.*;
import org.gradle.tooling.model.ProjectModel;
import org.gradle.tooling.model.build.BuildEnvironment;
import org.gradle.tooling.model.idea.IdeaModule;
@@ -164,38 +161,30 @@ public class GradleProjectResolver implements ExternalSystemProjectResolver<Grad
private @Nullable DataNode<ProjectData> resolveProjectInfo(
@NotNull DefaultProjectResolverContext resolverContext
) {
final long activityId = resolverContext.getExternalSystemTaskId().getId();
GradleExecutionSettings settings = resolverContext.getSettings();
ExternalSystemSyncActionsCollector.logSyncStarted(resolverContext.getExternalSystemTaskId().findProject(), activityId,
settings.isParallelModelFetch());
var projectPath = resolverContext.getProjectPath();
var id = resolverContext.getExternalSystemTaskId();
var settings = resolverContext.getSettings();
var listener = resolverContext.getListener();
var cancellationToken = resolverContext.getCancellationToken();
Span gradleExecutionSpan = ExternalSystemTelemetryUtil.getTracer(GradleConstants.SYSTEM_ID)
ExternalSystemSyncActionsCollector.logSyncStarted(id.findProject(), id.getId(), settings.isParallelModelFetch());
var gradleExecutionSpan = ExternalSystemTelemetryUtil.getTracer(GradleConstants.SYSTEM_ID)
.spanBuilder("GradleExecution")
.startSpan();
try (Scope ignore = gradleExecutionSpan.makeCurrent()) {
GradleWrapperHelper.ensureInstalledWrapper(
resolverContext.getExternalSystemTaskId(),
resolverContext.getProjectPath(),
resolverContext.getSettings(),
resolverContext.getListener(),
resolverContext.getCancellationToken()
);
final GradleProjectResolverExtension projectResolverChain = createProjectResolverChain(resolverContext);
GradleWrapperHelper.ensureInstalledWrapper(id, projectPath, settings, listener, cancellationToken);
var projectResolverChain = createProjectResolverChain(resolverContext);
var projectDataFunction = getProjectDataFunction(resolverContext, projectResolverChain);
final DataNode<ProjectData> projectDataNode = GradleExecutionHelper.execute(
resolverContext.getProjectPath(),
resolverContext.getSettings(),
resolverContext.getExternalSystemTaskId(),
resolverContext.getListener(),
resolverContext.getCancellationToken(),
projectDataFunction
);
var projectDataNode = GradleExecutionHelper.execute(projectPath, settings, id, listener, cancellationToken, projectDataFunction);
// auto-discover buildSrc projects of the main and included builds
String gradleVersion = resolverContext.getProjectGradleVersion();
var gradleVersion = resolverContext.getProjectGradleVersion();
if (gradleVersion != null && GradleVersionUtil.isGradleOlderThan(gradleVersion, "8.0")) {
String gradleHome = ObjectUtils.doIfNotNull(resolverContext.getUserData(GRADLE_HOME_DIR), it -> it.getPath());
var gradleHome = ObjectUtils.doIfNotNull(resolverContext.getUserData(GRADLE_HOME_DIR), it -> it.getPath());
new GradleBuildSrcProjectsResolver(this, resolverContext, gradleHome, projectResolverChain)
.discoverAndAppendTo(projectDataNode);
}