diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/PythonSdkConfigurator.kt b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/PythonSdkConfigurator.kt index 310ec0672ea1..696a9145e096 100644 --- a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/PythonSdkConfigurator.kt +++ b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/PythonSdkConfigurator.kt @@ -33,7 +33,7 @@ import com.intellij.python.community.services.systemPython.SystemPythonService import com.intellij.python.sdkConfigurator.common.enableSDKAutoConfigurator import com.intellij.util.PlatformUtils import com.jetbrains.python.PyBundle -import com.jetbrains.python.getOrLogException +import com.jetbrains.python.orLogException import com.jetbrains.python.sdk.* import com.jetbrains.python.sdk.conda.PyCondaSdkCustomizer import com.jetbrains.python.sdk.configuration.CreateSdkInfoWithTool @@ -241,7 +241,7 @@ class PythonSdkConfigurator : DirectoryProjectConfigurator { if (sdkCreator == null) { return false } - sdkCreator(true).getOrLogException(thisLogger()) + sdkCreator(true).orLogException(thisLogger()) return true } diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyHatchSdkConfiguration.kt b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyHatchSdkConfiguration.kt index 6e812f5acc98..c52c94dfd040 100644 --- a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyHatchSdkConfiguration.kt +++ b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyHatchSdkConfiguration.kt @@ -13,7 +13,7 @@ import com.intellij.python.hatch.cli.HatchEnvironment import com.intellij.python.hatch.getHatchService import com.intellij.python.hatch.impl.HATCH_TOOL_ID import com.jetbrains.python.errorProcessing.PyResult -import com.jetbrains.python.getOrLogException +import com.jetbrains.python.orLogException import com.jetbrains.python.hatch.sdk.createSdk import com.jetbrains.python.sdk.configuration.* import com.jetbrains.python.util.runWithModalBlockingOrInBackground @@ -42,13 +42,13 @@ class PyHatchSdkConfiguration : PyProjectTomlConfigurationExtension { ): EnvCheckerResult = reportRawProgress { it.text(PyCharmCommunityCustomizationBundle.message("sdk.set.up.hatch.project.analysis")) val hatchService = module.getHatchService().getOr { return EnvCheckerResult.CannotConfigure } - val canManage = if (checkToml) hatchService.isHatchManagedProject().getOrLogException(LOGGER) == true else true + val canManage = if (checkToml) hatchService.isHatchManagedProject().orLogException(LOGGER) == true else true val intentionName = PyCharmCommunityCustomizationBundle.message("sdk.set.up.hatch.environment") val envNotFound = EnvCheckerResult.EnvNotFound(intentionName) when { canManage && checkExistence -> { - val defaultEnv = hatchService.findDefaultVirtualEnvironmentOrNull().getOrLogException(LOGGER)?.pythonVirtualEnvironment + val defaultEnv = hatchService.findDefaultVirtualEnvironmentOrNull().orLogException(LOGGER)?.pythonVirtualEnvironment when (defaultEnv) { is PythonVirtualEnvironment.Existing -> EnvCheckerResult.EnvFound(defaultEnv.pythonInfo, intentionName) is PythonVirtualEnvironment.NotExisting, null -> envNotFound diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyPipfileSdkConfiguration.kt b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyPipfileSdkConfiguration.kt index 7c0bab2aad64..8bfb80fe0392 100644 --- a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyPipfileSdkConfiguration.kt +++ b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyPipfileSdkConfiguration.kt @@ -25,7 +25,7 @@ import com.intellij.ui.components.JBLabel import com.intellij.util.ui.JBUI import com.jetbrains.python.PyBundle import com.jetbrains.python.errorProcessing.PyResult -import com.jetbrains.python.getOrLogException +import com.jetbrains.python.orLogException import com.jetbrains.python.sdk.PythonSdkType import com.jetbrains.python.sdk.basePath import com.jetbrains.python.sdk.configuration.* @@ -66,7 +66,7 @@ class PyPipfileSdkConfiguration : PyProjectSdkConfigurationExtension { module: Module, checkExistence: CheckExistence, ): EnvCheckerResult = withBackgroundProgress(module.project, PyBundle.message("python.sdk.validating.environment")) { val pipfile = findAmongRoots(module, PipEnvFileHelper.PIP_FILE)?.name ?: return@withBackgroundProgress EnvCheckerResult.CannotConfigure - val pipEnvExecutable = getPipEnvExecutable().getOrLogException(LOGGER) ?: return@withBackgroundProgress EnvCheckerResult.CannotConfigure + val pipEnvExecutable = getPipEnvExecutable().orLogException(LOGGER) ?: return@withBackgroundProgress EnvCheckerResult.CannotConfigure val canManage = pipEnvExecutable.isExecutable() val intentionName = PyCharmCommunityCustomizationBundle.message("sdk.create.pipenv.suggestion", pipfile) val envNotFound = EnvCheckerResult.EnvNotFound(intentionName) @@ -100,7 +100,7 @@ class PyPipfileSdkConfiguration : PyProjectSdkConfigurationExtension { } private suspend fun askForEnvData(module: Module, source: Source, envExists: Boolean): PyAddNewPipEnvFromFilePanel.Data? { - val pipEnvExecutable = getPipEnvExecutable().getOrLogException(LOGGER) + val pipEnvExecutable = getPipEnvExecutable().orLogException(LOGGER) if ((envExists || source == Source.INSPECTION) && pipEnvExecutable?.isExecutable() == true) { return PyAddNewPipEnvFromFilePanel.Data(pipEnvExecutable) diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyUvSdkConfiguration.kt b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyUvSdkConfiguration.kt index 33a6b503b839..47a597eab803 100644 --- a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyUvSdkConfiguration.kt +++ b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyUvSdkConfiguration.kt @@ -16,7 +16,7 @@ import com.intellij.python.pyproject.PyProjectToml import com.intellij.python.pyproject.model.api.SuggestedSdk import com.intellij.python.pyproject.model.api.suggestSdk import com.jetbrains.python.errorProcessing.PyResult -import com.jetbrains.python.getOrLogException +import com.jetbrains.python.orLogException import com.jetbrains.python.onSuccess import com.jetbrains.python.sdk.* import com.jetbrains.python.sdk.configuration.* @@ -76,7 +76,7 @@ class PyUvSdkConfiguration : PyProjectTomlConfigurationExtension { } } ?: return EnvCheckerResult.CannotConfigure val tomlContentResult = withContext(Dispatchers.Default) { PyProjectToml.parse(tomlFileContent) } - val tomlContent = tomlContentResult.getOrLogException(logger) ?: return EnvCheckerResult.CannotConfigure + val tomlContent = tomlContentResult.orLogException(logger) ?: return EnvCheckerResult.CannotConfigure val project = tomlContent.project ?: return EnvCheckerResult.CannotConfigure project.name ?: module.name } diff --git a/python/openapi/src/com/jetbrains/python/Result.kt b/python/openapi/src/com/jetbrains/python/Result.kt index bd84937b508a..d0b62ad3d865 100644 --- a/python/openapi/src/com/jetbrains/python/Result.kt +++ b/python/openapi/src/com/jetbrains/python/Result.kt @@ -179,8 +179,6 @@ inline fun Result.mapError(code: (E) -> E2): Result = } // aliases to drop-in replace for kotlin Result -fun Result.getOrLogException(logger: Logger): S? = this.orLogException(logger) -fun Result.getOrLogExceptionAsWarn(logger: Logger): S? = this.orLogExceptionAsWarn(logger) fun Result.getOrNull(): S? = this.successOrNull val Result.isFailure: Boolean get() = this is Failure val Result.isSuccess: Boolean get() = this is Success diff --git a/python/src/com/jetbrains/python/sdk/add/v2/FileSystem.kt b/python/src/com/jetbrains/python/sdk/add/v2/FileSystem.kt index e31d6335a966..a828a86943e4 100644 --- a/python/src/com/jetbrains/python/sdk/add/v2/FileSystem.kt +++ b/python/src/com/jetbrains/python/sdk/add/v2/FileSystem.kt @@ -22,7 +22,7 @@ import com.jetbrains.python.PythonInfo import com.jetbrains.python.Result import com.jetbrains.python.errorProcessing.MessageError import com.jetbrains.python.errorProcessing.PyResult -import com.jetbrains.python.getOrLogException +import com.jetbrains.python.orLogException import com.jetbrains.python.isCondaVirtualEnv import com.jetbrains.python.pathValidation.PlatformAndRoot.Companion.getPlatformAndRoot import com.jetbrains.python.pathValidation.ValidationRequest @@ -342,7 +342,7 @@ internal suspend fun

FileSystem

.getExistingSelectableInterpr val languageLevel = sdk.versionString?.let { PythonSdkFlavor.getLanguageLevelFromVersionStringStaticSafe(it) } ?: run { - ExecService().validatePythonAndGetInfo(sdk.asBinToExecute()).getOrLogException(LOG)?.languageLevel + ExecService().validatePythonAndGetInfo(sdk.asBinToExecute()).orLogException(LOG)?.languageLevel } languageLevel?.let {