fix #1106

DonJayamanne · Jul 22, 2017 · 5fafae1 · 5fafae1
1 parent aced396
commit 5fafae1
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/src/client/linters/flake8.ts b/src/client/linters/flake8.ts
@@ -22,12 +22,12 @@ export class Linter extends baseLinter.BaseLinter {
 
         let flake8Path = this.pythonSettings.linting.flake8Path;
         let flake8Args = Array.isArray(this.pythonSettings.linting.flake8Args) ? this.pythonSettings.linting.flake8Args : [];
-        
-        if (flake8Args.length === 0 && ProductExecutableAndArgs.has(Product.flake8)){
+
+        if (flake8Args.length === 0 && ProductExecutableAndArgs.has(Product.flake8) && flake8Path.toLocaleLowerCase() === 'flake8') {
             flake8Path = ProductExecutableAndArgs.get(Product.flake8).executable;
             flake8Args = ProductExecutableAndArgs.get(Product.flake8).args;
         }
-        
+
         return new Promise<baseLinter.ILintMessage[]>((resolve, reject) => {
             this.run(flake8Path, flake8Args.concat(['--format=%(row)d,%(col)d,%(code).1s,%(code)s:%(text)s', document.uri.fsPath]), document, this.workspaceRootPath, cancellation).then(messages => {
                 messages.forEach(msg => {

diff --git a/src/client/linters/mypy.ts b/src/client/linters/mypy.ts
@@ -23,7 +23,7 @@ export class Linter extends baseLinter.BaseLinter {
         let mypyPath = this.pythonSettings.linting.mypyPath;
         let mypyArgs = Array.isArray(this.pythonSettings.linting.mypyArgs) ? this.pythonSettings.linting.mypyArgs : [];
 
-        if (mypyArgs.length === 0 && ProductExecutableAndArgs.has(Product.mypy)){
+        if (mypyArgs.length === 0 && ProductExecutableAndArgs.has(Product.mypy) && mypyPath.toLocaleLowerCase() === 'mypy'){
             mypyPath = ProductExecutableAndArgs.get(Product.mypy).executable;
             mypyArgs = ProductExecutableAndArgs.get(Product.mypy).args;
         }

diff --git a/src/client/linters/pep8Linter.ts b/src/client/linters/pep8Linter.ts
@@ -23,7 +23,7 @@ export class Linter extends baseLinter.BaseLinter {
         let pep8Path = this.pythonSettings.linting.pep8Path;
         let pep8Args = Array.isArray(this.pythonSettings.linting.pep8Args) ? this.pythonSettings.linting.pep8Args : [];
 
-        if (pep8Args.length === 0 && ProductExecutableAndArgs.has(Product.pep8)){
+        if (pep8Args.length === 0 && ProductExecutableAndArgs.has(Product.pep8) && pep8Path.toLocaleLowerCase() === 'pep8'){
             pep8Path = ProductExecutableAndArgs.get(Product.pep8).executable;
             pep8Args = ProductExecutableAndArgs.get(Product.pep8).args;
         }

diff --git a/src/client/linters/prospector.ts b/src/client/linters/prospector.ts
@@ -40,7 +40,7 @@ export class Linter extends baseLinter.BaseLinter {
         let outputChannel = this.outputChannel;
         let prospectorArgs = Array.isArray(this.pythonSettings.linting.prospectorArgs) ? this.pythonSettings.linting.prospectorArgs : [];
 
-        if (prospectorArgs.length === 0 && ProductExecutableAndArgs.has(Product.prospector)){
+        if (prospectorArgs.length === 0 && ProductExecutableAndArgs.has(Product.prospector) && prospectorPath.toLocaleLowerCase() === 'prospector'){
             prospectorPath = ProductExecutableAndArgs.get(Product.prospector).executable;
             prospectorArgs = ProductExecutableAndArgs.get(Product.prospector).args;
         }

diff --git a/src/client/linters/pydocstyle.ts b/src/client/linters/pydocstyle.ts
@@ -23,8 +23,8 @@ export class Linter extends baseLinter.BaseLinter {
 
         let pydocstylePath = this.pythonSettings.linting.pydocstylePath;
         let pydocstyleArgs = Array.isArray(this.pythonSettings.linting.pydocstyleArgs) ? this.pythonSettings.linting.pydocstyleArgs : [];
-        
-        if (pydocstyleArgs.length === 0 && ProductExecutableAndArgs.has(Product.pydocstyle)){
+
+        if (pydocstyleArgs.length === 0 && ProductExecutableAndArgs.has(Product.pydocstyle) && pydocstylePath.toLocaleLowerCase() === 'pydocstyle') {
             pydocstylePath = ProductExecutableAndArgs.get(Product.pydocstyle).executable;
             pydocstyleArgs = ProductExecutableAndArgs.get(Product.pydocstyle).args;
         }

diff --git a/src/client/linters/pylama.ts b/src/client/linters/pylama.ts
@@ -24,8 +24,8 @@ export class Linter extends baseLinter.BaseLinter {
 
         let pylamaPath = this.pythonSettings.linting.pylamaPath;
         let pylamaArgs = Array.isArray(this.pythonSettings.linting.pylamaArgs) ? this.pythonSettings.linting.pylamaArgs : [];
-        
-        if (pylamaArgs.length === 0 && ProductExecutableAndArgs.has(Product.pylama)){
+
+        if (pylamaArgs.length === 0 && ProductExecutableAndArgs.has(Product.pylama) && pylamaPath.toLocaleLowerCase() === 'pylama') {
             pylamaPath = ProductExecutableAndArgs.get(Product.pylama).executable;
             pylamaArgs = ProductExecutableAndArgs.get(Product.pylama).args;
         }

diff --git a/src/client/linters/pylint.ts b/src/client/linters/pylint.ts
@@ -20,8 +20,8 @@ export class Linter extends baseLinter.BaseLinter {
 
         let pylintPath = this.pythonSettings.linting.pylintPath;
         let pylintArgs = Array.isArray(this.pythonSettings.linting.pylintArgs) ? this.pythonSettings.linting.pylintArgs : [];
-        
-        if (pylintArgs.length === 0 && ProductExecutableAndArgs.has(Product.pylint)){
+
+        if (pylintArgs.length === 0 && ProductExecutableAndArgs.has(Product.pylint) && pylintPath === 'pylint') {
             pylintPath = ProductExecutableAndArgs.get(Product.pylint).executable;
             pylintArgs = ProductExecutableAndArgs.get(Product.pylint).args;
         }