From 6de0de271ef3422a398cac1cf5a8e2a2dbc7e985 Mon Sep 17 00:00:00 2001 From: Andrey Vokin Date: Wed, 17 Feb 2021 16:23:55 +0100 Subject: [PATCH] DS-1336 The interpreter is not set after creating a new workspace where it was selected In DataSpell new project creation from wizard performs in two steps: 1. Create a project and set SDK provided by user 2. Open project. GitOrigin-RevId: cc65dcab1aeee021c4a6e44633ec6a51d146f77e --- .../src/com/intellij/ide/impl/OpenProjectTask.kt | 7 +++++++ .../src/com/intellij/ide/impl/ProjectUtil.java | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/ide/impl/OpenProjectTask.kt b/platform/platform-impl/src/com/intellij/ide/impl/OpenProjectTask.kt index 41c35b0540c4..3bf34dc5ca0a 100644 --- a/platform/platform-impl/src/com/intellij/ide/impl/OpenProjectTask.kt +++ b/platform/platform-impl/src/com/intellij/ide/impl/OpenProjectTask.kt @@ -77,6 +77,13 @@ data class OpenProjectTask(val forceOpenInNewFrame: Boolean = false, isRefreshVfsNeeded = isRefreshVfsNeeded) } + @JvmStatic + fun fromWizardAndRunConfigurators(): OpenProjectTask { + return OpenProjectTask(runConfigurators = true, + isProjectCreatedWithWizard = true, + isRefreshVfsNeeded = false) + } + @JvmStatic @JvmOverloads fun withProjectToClose(projectToClose: Project?, forceOpenInNewFrame: Boolean = false): OpenProjectTask { diff --git a/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java b/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java index 31833ae2f8a2..0bcea7468ef3 100644 --- a/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java +++ b/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java @@ -812,7 +812,7 @@ public final class ProjectUtil { if (projectFile == null) { return null; } - return ProjectManagerEx.getInstanceEx().openProject(projectFile, OpenProjectTask.newProjectFromWizardAndRunConfigurators(null, false)); + return ProjectManagerEx.getInstanceEx().openProject(projectFile, OpenProjectTask.fromWizardAndRunConfigurators()); } private static void saveAndDisposeProject(@NotNull Project project) {