merged changes

DonJayamanne · DonJayamanne · commit d87eb86ed289 · 2016-03-11T20:35:45.000+11:00
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ Linting, Debugging (multi-threaded, web apps, remote), Intellisense, auto-comple
 * Debugging with support for local variables, arguments, expressions, watch window, stack information, break points
 * Debugging Multiple threads (Web Applications - Flask, etc) and expanding values (on Windows and Mac)
 * Debugging remote processes (attaching to local and remote process)
-* Debugging with support for shebang
+* Debugging with support for shebang (windows)
 * Debugging with custom environment variables
 * Unit testing (unittests and nosetests, with config files)
 * Sorting imports
diff --git a/src/client/formatters/autoPep8Formatter.ts b/src/client/formatters/autoPep8Formatter.ts
@@ -19,6 +19,6 @@ export class AutoPep8Formatter extends BaseFormatter {
     public formatDocument(document: vscode.TextDocument, options: vscode.FormattingOptions, token: vscode.CancellationToken): Thenable<vscode.TextEdit[]> {
         var autopep8Path = this.pythonSettings.formatting.autopep8Path;
         var fileDir = path.dirname(document.uri.fsPath);
-        return super.provideDocumentFormattingEdits(document, options, token, `${autopep8Path} ${document.uri.fsPath}`);
+        return super.provideDocumentFormattingEdits(document, options, token, `${autopep8Path} "${document.uri.fsPath}"`);
     }
 }
diff --git a/src/client/formatters/yapfFormatter.ts b/src/client/formatters/yapfFormatter.ts
@@ -19,6 +19,6 @@ export class YapfFormatter extends BaseFormatter {
     public formatDocument(document: vscode.TextDocument, options: vscode.FormattingOptions, token: vscode.CancellationToken): Thenable<vscode.TextEdit[]> {
         var yapfPath = this.pythonSettings.formatting.yapfPath;
         var fileDir = path.dirname(document.uri.fsPath);
-        return super.provideDocumentFormattingEdits(document, options, token, `${yapfPath} ${document.uri.fsPath}`);
+        return super.provideDocumentFormattingEdits(document, options, token, `${yapfPath} "${document.uri.fsPath}"`);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@ export class AutoPep8Formatter extends BaseFormatter {`
`19`	`19`	`public formatDocument(document: vscode.TextDocument, options: vscode.FormattingOptions, token: vscode.CancellationToken): Thenable<vscode.TextEdit[]> {`
`20`	`20`	`var autopep8Path = this.pythonSettings.formatting.autopep8Path;`
`21`	`21`	`var fileDir = path.dirname(document.uri.fsPath);`
`22`		- return super.provideDocumentFormattingEdits(document, options, token, `${autopep8Path} ${document.uri.fsPath}`);
	`22`	+ return super.provideDocumentFormattingEdits(document, options, token, `${autopep8Path} "${document.uri.fsPath}"`);
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@ export class YapfFormatter extends BaseFormatter {`
`19`	`19`	`public formatDocument(document: vscode.TextDocument, options: vscode.FormattingOptions, token: vscode.CancellationToken): Thenable<vscode.TextEdit[]> {`
`20`	`20`	`var yapfPath = this.pythonSettings.formatting.yapfPath;`
`21`	`21`	`var fileDir = path.dirname(document.uri.fsPath);`
`22`		- return super.provideDocumentFormattingEdits(document, options, token, `${yapfPath} ${document.uri.fsPath}`);
	`22`	+ return super.provideDocumentFormattingEdits(document, options, token, `${yapfPath} "${document.uri.fsPath}"`);
`23`	`23`	`}`
`24`	`24`	`}`