From 75386f5159aff1c3ca7c12a5dffffa0c96b42c35 Mon Sep 17 00:00:00 2001
From: Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Date: Tue, 19 Jul 2016 18:08:15 +0300
Subject: [PATCH] associate silently created virtual env with new project

---
 .../actions/PythonGenerateProjectCallback.java           | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/python/ide/src/com/jetbrains/python/newProject/actions/PythonGenerateProjectCallback.java b/python/ide/src/com/jetbrains/python/newProject/actions/PythonGenerateProjectCallback.java
index 220ea0d959f0..b7ee703ddb21 100644
--- a/python/ide/src/com/jetbrains/python/newProject/actions/PythonGenerateProjectCallback.java
+++ b/python/ide/src/com/jetbrains/python/newProject/actions/PythonGenerateProjectCallback.java
@@ -28,6 +28,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.SdkAdditionalData;
+import com.intellij.openapi.projectRoots.impl.ProjectJdkImpl;
 import com.intellij.openapi.projectRoots.impl.SdkConfigurationUtil;
 import com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectSdksModel;
 import com.intellij.openapi.ui.Messages;
@@ -162,6 +163,14 @@ public class PythonGenerateProjectCallback implements NullableConsumer<ProjectSe
             catch (ConfigurationException exception) {
               LOG.error("Error adding created virtual env " + exception.getMessage());
             }
+            if (associateWithProject) {
+              SdkAdditionalData additionalData = createdSdk.getSdkAdditionalData();
+              if (additionalData == null) {
+                additionalData = new PythonSdkAdditionalData(PythonSdkFlavor.getFlavor(createdSdk.getHomePath()));
+                ((ProjectJdkImpl)createdSdk).setSdkAdditionalData(additionalData);
+              }
+            ((PythonSdkAdditionalData)additionalData).associateWithNewProject();
+            }
           }
         });
       }