From 248aabf6e2ca29ee7464f968868d70723ff7fb2c Mon Sep 17 00:00:00 2001
From: Michael Plump <plumpy@google.com>
Date: Mon, 6 Feb 2017 11:36:13 -0500
Subject: [PATCH] Pass the project as a parameter to getDefaultFolder.

---
 .../jetbrains/plugins/terminal/LocalTerminalCustomizer.java    | 3 +--
 .../jetbrains/plugins/terminal/LocalTerminalDirectRunner.java  | 2 +-
 .../plugins/terminal/TerminalProjectOptionsProvider.kt         | 2 +-
 .../com/jetbrains/python/sdk/PyVirtualEnvTerminalCustomizer.kt | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalCustomizer.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalCustomizer.java
index caa6d26867f1..9d50d7f61f29 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalCustomizer.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalCustomizer.java
@@ -18,7 +18,6 @@ package org.jetbrains.plugins.terminal;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.options.UnnamedConfigurable;
 import com.intellij.openapi.project.Project;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Map;
@@ -36,7 +35,7 @@ public abstract class LocalTerminalCustomizer {
   }
 
   @Nullable
-  protected String getDefaultFolder() {
+  protected String getDefaultFolder(Project project) {
     return null;
   }
 
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
index 8569af01950e..3acb72f202af 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
@@ -127,7 +127,7 @@ public class LocalTerminalDirectRunner extends AbstractTerminalRunner<PtyProcess
         command = customizer.customizeCommandAndEnvironment(myProject, command, envs);
 
         if (directory == null) {
-          directory = customizer.getDefaultFolder();
+          directory = customizer.getDefaultFolder(myProject);
         }
       }
       catch (Exception e) {
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalProjectOptionsProvider.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalProjectOptionsProvider.kt
index f0d15298033d..c1627184a31b 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalProjectOptionsProvider.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalProjectOptionsProvider.kt
@@ -56,7 +56,7 @@ class TerminalProjectOptionsProvider(val project: Project) : PersistentStateComp
         try {
 
           if (directory == null) {
-            directory = customizer.defaultFolder
+            directory = customizer.getDefaultFolder(project)
           }
         }
         catch (e: Exception) {
diff --git a/python/python-terminal/src/com/jetbrains/python/sdk/PyVirtualEnvTerminalCustomizer.kt b/python/python-terminal/src/com/jetbrains/python/sdk/PyVirtualEnvTerminalCustomizer.kt
index 2bdbb4ce8460..839d7d5445ab 100644
--- a/python/python-terminal/src/com/jetbrains/python/sdk/PyVirtualEnvTerminalCustomizer.kt
+++ b/python/python-terminal/src/com/jetbrains/python/sdk/PyVirtualEnvTerminalCustomizer.kt
@@ -89,7 +89,7 @@ class PyVirtualEnvTerminalCustomizer : LocalTerminalCustomizer() {
   }
 
 
-  override fun getDefaultFolder(): String? {
+  override fun getDefaultFolder(project: Project): String? {
     return null
   }