From a4d4e49f71f3ddf280f94c7ce9b6c9a315923762 Mon Sep 17 00:00:00 2001 From: Vitaly Legchilkin Date: Fri, 7 Mar 2025 16:54:38 +0100 Subject: [PATCH] [python] adjust welcome script location to use source root if available (PY-79446) GitOrigin-RevId: fb3b8690d2b441f8bc9ee708389913c1c353ba1b --- .../impl/emptyProject/PyV3EmptyProjectSettings.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/newProjectWizard/impl/emptyProject/PyV3EmptyProjectSettings.kt b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/newProjectWizard/impl/emptyProject/PyV3EmptyProjectSettings.kt index 954a9c5093ee..a5d366613173 100644 --- a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/newProjectWizard/impl/emptyProject/PyV3EmptyProjectSettings.kt +++ b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/newProjectWizard/impl/emptyProject/PyV3EmptyProjectSettings.kt @@ -5,12 +5,13 @@ import com.intellij.openapi.application.EDT import com.intellij.openapi.application.edtWriteAction import com.intellij.openapi.application.writeIntentReadAction import com.intellij.openapi.module.Module +import com.intellij.openapi.project.rootManager import com.intellij.openapi.projectRoots.Sdk import com.intellij.openapi.vfs.VirtualFile -import com.jetbrains.python.newProjectWizard.PyV3ProjectTypeSpecificSettings import com.intellij.pycharm.community.ide.impl.newProjectWizard.welcome.PyWelcome import com.jetbrains.python.Result import com.jetbrains.python.errorProcessing.PyError +import com.jetbrains.python.newProjectWizard.PyV3ProjectTypeSpecificSettings import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext @@ -18,8 +19,10 @@ class PyV3EmptyProjectSettings(var generateWelcomeScript: Boolean = false) : PyV override suspend fun generateProject(module: Module, baseDir: VirtualFile, sdk: Sdk): Result { if (!generateWelcomeScript) return Result.success(Unit) + + val sourceRoot = module.rootManager.sourceRoots.firstOrNull() ?: baseDir val file = edtWriteAction { - PyWelcome.prepareFile(module.project, baseDir) + PyWelcome.prepareFile(module.project, sourceRoot) } withContext(Dispatchers.EDT) { writeIntentReadAction {