From 6692a9618291189b2f2aa43c392f0e47c45a82b0 Mon Sep 17 00:00:00 2001
From: Elizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Date: Mon, 11 Dec 2017 20:17:18 +0300
Subject: [PATCH] "Show command line..." setting ignores "Use IPython if
 available" (PY-20950)

Define an appropriate env variable and merge variables from Run configuration and Console settings
---
 .../jetbrains/python/run/PythonScriptCommandLineState.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/python/src/com/jetbrains/python/run/PythonScriptCommandLineState.java b/python/src/com/jetbrains/python/run/PythonScriptCommandLineState.java
index 5ea83f947c94..54b64b1217cc 100644
--- a/python/src/com/jetbrains/python/run/PythonScriptCommandLineState.java
+++ b/python/src/com/jetbrains/python/run/PythonScriptCommandLineState.java
@@ -16,6 +16,7 @@
 package com.jetbrains.python.run;
 
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import com.intellij.execution.DefaultExecutionResult;
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.ExecutionResult;
@@ -110,9 +111,13 @@ public class PythonScriptCommandLineState extends PythonCommandLineState {
         throw new ExecutionException("Cannot find SDK for Run configuration " + myConfig.getName());
       }
 
+      Map<String, String> unitedEnvs = Maps.newHashMap(settingsProvider.getEnvs());
+      unitedEnvs.putAll(myConfig.getEnvs());
+      PydevConsoleRunnerFactory.putIPythonEnvFlag(project, unitedEnvs);
+
       PythonScriptWithConsoleRunner runner =
         new PythonScriptWithConsoleRunner(project, myConfig.getSdk(), PyConsoleType.PYTHON, workingDir,
-                                          myConfig.getEnvs(), patchers,
+                                          unitedEnvs, patchers,
                                           settingsProvider,
                                           setupFragment);
       runner.setEnableAfterConnection(false);