set current directory for pylint, pep8 and flask commands #117

Author: DonJayamanne

src/client/linters/baseLinter.ts

@@ -62,18 +62,17 @@ export abstract class BaseLinter {
  return Promise.resolve([]);
  }
 
- protected run(commandLine: string, filePath: string, txtDocumentLines: string[], regEx: string = REGEX): Promise<ILintMessage[]> {
+ protected run(commandLine: string, filePath: string, txtDocumentLines: string[], cwd: string, regEx: string = REGEX): Promise<ILintMessage[]> {
  var outputChannel = this.outputChannel;
  var linterId = this.Id;
 
  return new Promise<ILintMessage[]>((resolve, reject) => {
- var fileDir = path.dirname(filePath);
- sendCommand(commandLine, fileDir, true).then(data => {
+ sendCommand(commandLine, cwd, true).then(data => {
  outputChannel.clear();
- outputChannel.append(data); 
+ outputChannel.append(data);
  var outputLines = data.split(/\r?\n/g);
  var diagnostics: ILintMessage[] = [];
- outputLines.filter((value, index) => index <= this.pythonSettings.linting.maxNumberOfProblems).forEach(line=> {
+ outputLines.filter((value, index) => index <= this.pythonSettings.linting.maxNumberOfProblems).forEach(line => {
  var match = matchNamedRegEx(line, regEx);
  if (match == null) {
  return;
@@ -86,7 +85,7 @@ export abstract class BaseLinter {
  var sourceLine = txtDocumentLines[match.line - 1];
  var sourceStart = sourceLine.substring(match.column - 1);
  var endCol = txtDocumentLines[match.line - 1].length;
- 
+
  //try to get the first word from the startig position
  var possibleProblemWords = sourceStart.match(/\w+/g);
  var possibleWord: string;
@@ -111,7 +110,7 @@ export abstract class BaseLinter {
  });
 
  resolve(diagnostics);
- }, error=> {
+ }, error => {
  outputChannel.appendLine(`Linting with ${linterId} failed. If not installed please turn if off in settings.\n ${error}`);
  window.showInformationMessage(`Linting with ${linterId} failed. If not installed please turn if off in settings. View Python output for details.`);
  });

src/client/linters/flake8.ts

@@ -3,7 +3,7 @@
 import * as path from 'path';
 import * as baseLinter from './baseLinter';
 import * as settings from './../common/configSettings';
-import {OutputChannel} from 'vscode';
+import {OutputChannel, workspace} from 'vscode';
 
 const FLAKE8_COMMANDLINE = " --format='%(row)d,%(col)d,%(code)s,%(code)s:%(text)s'";
 
@@ -20,7 +20,7 @@ export class Linter extends baseLinter.BaseLinter {
  var flake8Path = this.pythonSettings.linting.flake8Path;
  var cmdLine = `${flake8Path} ${FLAKE8_COMMANDLINE} "${filePath}"`;
  return new Promise<baseLinter.ILintMessage[]>((resolve, reject) => {
- this.run(cmdLine, filePath, txtDocumentLines).then(messages=> {
+ this.run(cmdLine, filePath, txtDocumentLines, workspace.rootPath).then(messages=> {
  //All messages in pep8 are treated as warnings for now
  messages.forEach(msg=> {
  msg.severity = baseLinter.LintMessageSeverity.Information;

src/client/linters/pep8Linter.ts

@@ -3,7 +3,7 @@
 import * as path from 'path';
 import * as baseLinter from './baseLinter';
 import * as settings from './../common/configSettings';
-import {OutputChannel} from 'vscode';
+import {OutputChannel, workspace} from 'vscode';
 
 const PEP_COMMANDLINE = " --format='%(row)d,%(col)d,%(code)s,%(code)s:%(text)s'";
 
@@ -20,7 +20,7 @@ export class Linter extends baseLinter.BaseLinter {
  var pep8Path = this.pythonSettings.linting.pep8Path;
  var cmdLine = `${pep8Path} ${PEP_COMMANDLINE} "${filePath}"`;
  return new Promise<baseLinter.ILintMessage[]>(resolve => {
- this.run(cmdLine, filePath, txtDocumentLines).then(messages=> {
+ this.run(cmdLine, filePath, txtDocumentLines, workspace.rootPath).then(messages=> {
  //All messages in pep8 are treated as warnings for now
  messages.forEach(msg=> {
  msg.severity = baseLinter.LintMessageSeverity.Information;

src/client/linters/pylint.ts

@@ -3,7 +3,7 @@
 import * as path from 'path';
 import * as baseLinter from './baseLinter';
 import * as settings from './../common/configSettings';
-import {OutputChannel} from 'vscode';
+import {OutputChannel, workspace} from 'vscode';
 
 const PYLINT_COMMANDLINE = " --msg-template='{line},{column},{category},{msg_id}:{msg}' --reports=n --output-format=text";
 
@@ -32,7 +32,7 @@ export class Linter extends baseLinter.BaseLinter {
  var pylintPath = this.pythonSettings.linting.pylintPath;
  var cmdLine = `${pylintPath} ${PYLINT_COMMANDLINE} "${filePath}"`;
  return new Promise<baseLinter.ILintMessage[]>((resolve, reject) => {
- this.run(cmdLine, filePath, txtDocumentLines).then(messages=> {
+ this.run(cmdLine, filePath, txtDocumentLines, workspace.rootPath).then(messages=> {
  messages.forEach(msg=> {
  msg.severity = this.parseMessagesSeverity(msg.type);
  });