Added setting to execute files in terminal using the file's directory as the working directory

Author: gandhis1

package.json

@@ -675,6 +675,12 @@
           "type": "string",
           "default": "Python Test Log",
           "description": "The output window name for the unit test messages, defaults to Python output window."
+        },
+
+        "python.terminal.executeInFileDir": {
+          "type": "boolean",
+          "default": false,
+          "description": "When executing a file in the terminal, whether to use execute in the file's directory, instead of the current open folder."
         }
       }
     }

src/client/common/configSettings.ts

@@ -12,6 +12,7 @@ export interface IPythonSettings {
     formatting: IFormattingSettings;
     unitTest: IUnitTestSettings;
     autoComplete: IAutoCompeteSettings;
+    terminal: ITerminalSettings;
 }
 export interface IUnitTestSettings {
     nosetestsEnabled: boolean;
@@ -66,6 +67,10 @@ export interface IFormattingSettings {
 export interface IAutoCompeteSettings {
     extraPaths: string[];
 }
+export interface ITerminalSettings {
+    executeInFileDir: boolean;
+}
+
 const systemVariables: SystemVariables = new SystemVariables();
 export class PythonSettings extends EventEmitter implements IPythonSettings {
     private static pythonSettings: PythonSettings = new PythonSettings();
@@ -135,6 +140,14 @@ export class PythonSettings extends EventEmitter implements IPythonSettings {
         this.unitTest.nosetestArgs = this.unitTest.nosetestArgs.map(arg => systemVariables.resolveAny(arg));
         this.unitTest.pyTestArgs = this.unitTest.pyTestArgs.map(arg => systemVariables.resolveAny(arg));
         this.unitTest.unittestArgs = this.unitTest.unittestArgs.map(arg => systemVariables.resolveAny(arg));
+
+        let terminalSettings = systemVariables.resolveAny(pythonSettings.get<ITerminalSettings>('terminal'));
+        if (this.terminal) {
+            Object.assign<ITerminalSettings, ITerminalSettings>(this.terminal, terminalSettings);
+        }
+        else {
+            this.terminal = terminalSettings;
+        }
     }
 
     public pythonPath: string;
@@ -143,6 +156,7 @@ export class PythonSettings extends EventEmitter implements IPythonSettings {
     public formatting: IFormattingSettings;
     public autoComplete: IAutoCompeteSettings;
     public unitTest: IUnitTestSettings;
+    public terminal: ITerminalSettings;
 }
 
 function getAbsolutePath(pathToCheck: string, rootDir: String): string {

src/client/providers/execInTerminalProvider.ts

@@ -2,14 +2,16 @@
 import * as vscode from 'vscode';
 import * as settings from '../common/configSettings';
 import { Commands } from '../common/constants';
+let path = require('path');
 
 export function activateExecInTerminalProvider() {
     vscode.commands.registerCommand(Commands.Exec_In_Terminal, execInTerminal);
     vscode.commands.registerCommand(Commands.Exec_Selection_In_Terminal, execSelectionInTerminal);
 }
 
 function execInTerminal(fileUri?: vscode.Uri) {
-    const currentPythonPath = settings.PythonSettings.getInstance().pythonPath;
+    let pythonSettings = settings.PythonSettings.getInstance()
+    const currentPythonPath = pythonSettings.pythonPath;
     let filePath: string;
 
     if (fileUri === undefined) {
@@ -38,8 +40,13 @@ function execInTerminal(fileUri?: vscode.Uri) {
         filePath = `"${filePath}"`;
     }
     const terminal = vscode.window.createTerminal(`Python`);
+    if (pythonSettings.terminal.executeInFileDir) {
+        let fileDirPath = path.dirname(filePath).substring(1);
+        if (fileDirPath != vscode.workspace.rootPath) {
+            terminal.sendText(`cd "${fileDirPath}"`);
+        }
+    }
     terminal.sendText(`${currentPythonPath} ${filePath}`);
-
 }
 
 function execSelectionInTerminal() {