Merge pull request #510 from plumpy/master

Pass the project as a parameter to getDefaultFolder.

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;
   }
 

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) {

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) {

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
   }