From a51d362cceaa91d44bd2e2e8ca411c4fc38aa734 Mon Sep 17 00:00:00 2001 From: Semyon Proshev Date: Fri, 20 Nov 2020 02:01:30 +0300 Subject: [PATCH] Don't forget about detected pipenv while validating its path field (PY-45546) GitOrigin-RevId: 22513f325c6dd0c3db8f465b46c69133073529d1 --- .../src/com/jetbrains/python/sdk/pipenv/PyAddPipEnvPanel.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python/src/com/jetbrains/python/sdk/pipenv/PyAddPipEnvPanel.kt b/python/src/com/jetbrains/python/sdk/pipenv/PyAddPipEnvPanel.kt index d0d3d93c16dc..ab2c5b80c65d 100644 --- a/python/src/com/jetbrains/python/sdk/pipenv/PyAddPipEnvPanel.kt +++ b/python/src/com/jetbrains/python/sdk/pipenv/PyAddPipEnvPanel.kt @@ -129,7 +129,7 @@ class PyAddPipEnvPanel(private val project: Project?, } override fun validateAll(): List = - listOfNotNull(validatePipEnvExecutable(pipEnvPathField.text), validatePipEnvIsNotAdded()) + listOfNotNull(validatePipEnvExecutable(), validatePipEnvIsNotAdded()) override fun addChangeListener(listener: Runnable) { pipEnvPathField.textField.document.addDocumentListener(object : DocumentAdapter() { @@ -155,6 +155,10 @@ class PyAddPipEnvPanel(private val project: Project?, private val selectedModule: Module? get() = module ?: moduleField.selectedItem as? Module + private fun validatePipEnvExecutable(): ValidationInfo? { + return validatePipEnvExecutable(pipEnvPathField.text.nullize() ?: detectPipEnvExecutable()?.absolutePath) + } + /** * Checks if the pipenv for the project hasn't been already added. */