From a37c7a545a08ebf46d80ebd4330308d20a0b4f0b Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Tue, 9 Jun 2020 10:35:27 +0300 Subject: [PATCH] IDEA-CR-1672: fix support to use build script file(instead of directory) as to run a build GitOrigin-RevId: e25718efd4608ccac85428657af2a396f2ed1e60 --- .../execution/GradleExecutionHelper.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleExecutionHelper.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleExecutionHelper.java index 989613a19e50..4f6ea0c371ab 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleExecutionHelper.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleExecutionHelper.java @@ -96,21 +96,21 @@ public class GradleExecutionHelper { @Nullable ExternalSystemTaskNotificationListener listener, @Nullable CancellationTokenSource cancellationTokenSource, @NotNull Function f) { + String projectDir; + File projectPathFile = new File(projectPath); + if (projectPathFile.isFile() && projectPath.endsWith(GradleConstants.EXTENSION) && projectPathFile.getParent() != null) { + projectDir = projectPathFile.getParent(); + } + else { + projectDir = projectPath; + } CancellationToken cancellationToken = cancellationTokenSource != null ? cancellationTokenSource.token() : null; return withGradleConnection( - projectPath, taskId, settings, listener, cancellationToken, + projectDir, taskId, settings, listener, cancellationToken, connection -> { String userDir = null; if (!GradleEnvironment.ADJUST_USER_DIR) { try { - String projectDir; - File projectPathFile = new File(projectPath); - if (projectPathFile.isFile() && projectPath.endsWith(GradleConstants.EXTENSION) && projectPathFile.getParent() != null) { - projectDir = projectPathFile.getParent(); - } - else { - projectDir = projectPath; - } userDir = System.getProperty("user.dir"); if (userDir != null) System.setProperty("user.dir", projectDir); }