fix #799

Author: DonJayamanne

src/client/formatters/baseFormatter.ts

@@ -16,8 +16,9 @@ export abstract class BaseFormatter {
 
  public abstract formatDocument(document: vscode.TextDocument, options: vscode.FormattingOptions, token: vscode.CancellationToken, range?: vscode.Range): Thenable<vscode.TextEdit[]>;
 
- protected provideDocumentFormattingEdits(document: vscode.TextDocument, options: vscode.FormattingOptions, token: vscode.CancellationToken, command: string, args: string[]): Thenable<vscode.TextEdit[]> {
+ protected provideDocumentFormattingEdits(document: vscode.TextDocument, options: vscode.FormattingOptions, token: vscode.CancellationToken, command: string, args: string[], cwd: string = null): Thenable<vscode.TextEdit[]> {
  this.outputChannel.clear();
+ cwd = typeof cwd === 'string' && cwd.length > 0 ? cwd : (this.workspaceRootPath ? this.workspaceRootPath : vscode.workspace.rootPath);
 
  // autopep8 and yapf have the ability to read from the process input stream and return the formatted code out of the output stream
  // However they don't support returning the diff of the formatted text when reading data from the input stream
@@ -29,8 +30,7 @@ export abstract class BaseFormatter {
  if (token && token.isCancellationRequested) {
  return [filePath, ''];
  }
- const workspaceRoot = this.workspaceRootPath ? this.workspaceRootPath : vscode.workspace.rootPath;
- return Promise.all<string>([Promise.resolve(filePath), execPythonFile(command, args.concat([filePath]), workspaceRoot)]);
+ return Promise.all<string>([Promise.resolve(filePath), execPythonFile(command, args.concat([filePath]), cwd)]);
  }).then(data => {
  // Delete the temporary file created
  if (tmpFileCreated) {

src/client/formatters/yapfFormatter.ts

@@ -1,9 +1,10 @@
 'use strict';
 
 import * as vscode from 'vscode';
-import {BaseFormatter} from './baseFormatter';
+import { BaseFormatter } from './baseFormatter';
 import * as settings from './../common/configSettings';
 import { Product } from '../common/installer';
+import * as path from 'path';
 
 export class YapfFormatter extends BaseFormatter {
  constructor(outputChannel: vscode.OutputChannel, pythonSettings: settings.IPythonSettings, workspaceRootPath?: string) {
@@ -17,6 +18,8 @@ export class YapfFormatter extends BaseFormatter {
  if (range && !range.isEmpty) {
  yapfArgs = yapfArgs.concat(['--lines', `${range.start.line + 1}-${range.end.line + 1}`]);
  }
- return super.provideDocumentFormattingEdits(document, options, token, yapfPath, yapfArgs);
+ // Yapf starts looking for config file starting from the file path
+ let cwd = path.dirname(document.fileName);
+ return super.provideDocumentFormattingEdits(document, options, token, yapfPath, yapfArgs, cwd);
  }
 }