From 31bd9482b4db0ecfc883c0fb83ab43d912369049 Mon Sep 17 00:00:00 2001
From: Andrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Date: Mon, 7 May 2018 13:56:26 +0300
Subject: [PATCH] PY-26492 Pipenv environment type for the new project dialog

---
 .../python/newProject/steps/PyAddNewEnvironmentPanel.kt     | 6 ++----
 python/src/com/jetbrains/python/sdk/add/PyAddPipEnvPanel.kt | 1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/python/python-community-configure/src/com/jetbrains/python/newProject/steps/PyAddNewEnvironmentPanel.kt b/python/python-community-configure/src/com/jetbrains/python/newProject/steps/PyAddNewEnvironmentPanel.kt
index 20a81984e2e3..50888ba9d90c 100644
--- a/python/python-community-configure/src/com/jetbrains/python/newProject/steps/PyAddNewEnvironmentPanel.kt
+++ b/python/python-community-configure/src/com/jetbrains/python/newProject/steps/PyAddNewEnvironmentPanel.kt
@@ -6,10 +6,7 @@ import com.intellij.openapi.ui.ValidationInfo
 import com.intellij.ui.ColoredListCellRenderer
 import com.intellij.util.ui.FormBuilder
 import com.jetbrains.python.sdk.PySdkSettings
-import com.jetbrains.python.sdk.add.PyAddNewCondaEnvPanel
-import com.jetbrains.python.sdk.add.PyAddNewEnvPanel
-import com.jetbrains.python.sdk.add.PyAddNewVirtualEnvPanel
-import com.jetbrains.python.sdk.add.PyAddSdkPanel
+import com.jetbrains.python.sdk.add.*
 import java.awt.BorderLayout
 import java.awt.event.ItemEvent
 import javax.swing.JComboBox
@@ -31,6 +28,7 @@ class PyAddNewEnvironmentPanel(existingSdks: List<Sdk>, newProjectPath: String?,
     }
 
   private val panels = listOf(PyAddNewVirtualEnvPanel(null, existingSdks, newProjectPath),
+                              PyAddPipEnvPanel(null, existingSdks, newProjectPath),
                               PyAddNewCondaEnvPanel(null, existingSdks, newProjectPath))
 
   var selectedPanel: PyAddNewEnvPanel = panels.find { it.envName == preferredType ?: PySdkSettings.instance.preferredEnvironmentType } ?: panels[0]
diff --git a/python/src/com/jetbrains/python/sdk/add/PyAddPipEnvPanel.kt b/python/src/com/jetbrains/python/sdk/add/PyAddPipEnvPanel.kt
index 90934f31afd5..99a7e97a78f9 100644
--- a/python/src/com/jetbrains/python/sdk/add/PyAddPipEnvPanel.kt
+++ b/python/src/com/jetbrains/python/sdk/add/PyAddPipEnvPanel.kt
@@ -34,6 +34,7 @@ class PyAddPipEnvPanel(private val project: Project?,
   private val languageLevelsField: JComboBox<String>
   private val installPackagesCheckBox = JBCheckBox("Install packages from Pipfile").apply {
     isEnabled = projectPipFile != null
+    isVisible = newProjectPath != null
   }
 
   init {