Skip to content

Commit 5fafae1

Browse files
committed
fix #1106
1 parent aced396 commit 5fafae1

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

src/client/linters/flake8.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ export class Linter extends baseLinter.BaseLinter {
2222

2323
let flake8Path = this.pythonSettings.linting.flake8Path;
2424
let flake8Args = Array.isArray(this.pythonSettings.linting.flake8Args) ? this.pythonSettings.linting.flake8Args : [];
25-
26-
if (flake8Args.length === 0 && ProductExecutableAndArgs.has(Product.flake8)){
25+
26+
if (flake8Args.length === 0 && ProductExecutableAndArgs.has(Product.flake8) && flake8Path.toLocaleLowerCase() === 'flake8') {
2727
flake8Path = ProductExecutableAndArgs.get(Product.flake8).executable;
2828
flake8Args = ProductExecutableAndArgs.get(Product.flake8).args;
2929
}
30-
30+
3131
return new Promise<baseLinter.ILintMessage[]>((resolve, reject) => {
3232
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 => {
3333
messages.forEach(msg => {

src/client/linters/mypy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export class Linter extends baseLinter.BaseLinter {
2323
let mypyPath = this.pythonSettings.linting.mypyPath;
2424
let mypyArgs = Array.isArray(this.pythonSettings.linting.mypyArgs) ? this.pythonSettings.linting.mypyArgs : [];
2525

26-
if (mypyArgs.length === 0 && ProductExecutableAndArgs.has(Product.mypy)){
26+
if (mypyArgs.length === 0 && ProductExecutableAndArgs.has(Product.mypy) && mypyPath.toLocaleLowerCase() === 'mypy'){
2727
mypyPath = ProductExecutableAndArgs.get(Product.mypy).executable;
2828
mypyArgs = ProductExecutableAndArgs.get(Product.mypy).args;
2929
}

src/client/linters/pep8Linter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export class Linter extends baseLinter.BaseLinter {
2323
let pep8Path = this.pythonSettings.linting.pep8Path;
2424
let pep8Args = Array.isArray(this.pythonSettings.linting.pep8Args) ? this.pythonSettings.linting.pep8Args : [];
2525

26-
if (pep8Args.length === 0 && ProductExecutableAndArgs.has(Product.pep8)){
26+
if (pep8Args.length === 0 && ProductExecutableAndArgs.has(Product.pep8) && pep8Path.toLocaleLowerCase() === 'pep8'){
2727
pep8Path = ProductExecutableAndArgs.get(Product.pep8).executable;
2828
pep8Args = ProductExecutableAndArgs.get(Product.pep8).args;
2929
}

src/client/linters/prospector.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export class Linter extends baseLinter.BaseLinter {
4040
let outputChannel = this.outputChannel;
4141
let prospectorArgs = Array.isArray(this.pythonSettings.linting.prospectorArgs) ? this.pythonSettings.linting.prospectorArgs : [];
4242

43-
if (prospectorArgs.length === 0 && ProductExecutableAndArgs.has(Product.prospector)){
43+
if (prospectorArgs.length === 0 && ProductExecutableAndArgs.has(Product.prospector) && prospectorPath.toLocaleLowerCase() === 'prospector'){
4444
prospectorPath = ProductExecutableAndArgs.get(Product.prospector).executable;
4545
prospectorArgs = ProductExecutableAndArgs.get(Product.prospector).args;
4646
}

src/client/linters/pydocstyle.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ export class Linter extends baseLinter.BaseLinter {
2323

2424
let pydocstylePath = this.pythonSettings.linting.pydocstylePath;
2525
let pydocstyleArgs = Array.isArray(this.pythonSettings.linting.pydocstyleArgs) ? this.pythonSettings.linting.pydocstyleArgs : [];
26-
27-
if (pydocstyleArgs.length === 0 && ProductExecutableAndArgs.has(Product.pydocstyle)){
26+
27+
if (pydocstyleArgs.length === 0 && ProductExecutableAndArgs.has(Product.pydocstyle) && pydocstylePath.toLocaleLowerCase() === 'pydocstyle') {
2828
pydocstylePath = ProductExecutableAndArgs.get(Product.pydocstyle).executable;
2929
pydocstyleArgs = ProductExecutableAndArgs.get(Product.pydocstyle).args;
3030
}

src/client/linters/pylama.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ export class Linter extends baseLinter.BaseLinter {
2424

2525
let pylamaPath = this.pythonSettings.linting.pylamaPath;
2626
let pylamaArgs = Array.isArray(this.pythonSettings.linting.pylamaArgs) ? this.pythonSettings.linting.pylamaArgs : [];
27-
28-
if (pylamaArgs.length === 0 && ProductExecutableAndArgs.has(Product.pylama)){
27+
28+
if (pylamaArgs.length === 0 && ProductExecutableAndArgs.has(Product.pylama) && pylamaPath.toLocaleLowerCase() === 'pylama') {
2929
pylamaPath = ProductExecutableAndArgs.get(Product.pylama).executable;
3030
pylamaArgs = ProductExecutableAndArgs.get(Product.pylama).args;
3131
}

src/client/linters/pylint.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ export class Linter extends baseLinter.BaseLinter {
2020

2121
let pylintPath = this.pythonSettings.linting.pylintPath;
2222
let pylintArgs = Array.isArray(this.pythonSettings.linting.pylintArgs) ? this.pythonSettings.linting.pylintArgs : [];
23-
24-
if (pylintArgs.length === 0 && ProductExecutableAndArgs.has(Product.pylint)){
23+
24+
if (pylintArgs.length === 0 && ProductExecutableAndArgs.has(Product.pylint) && pylintPath === 'pylint') {
2525
pylintPath = ProductExecutableAndArgs.get(Product.pylint).executable;
2626
pylintArgs = ProductExecutableAndArgs.get(Product.pylint).args;
2727
}

0 commit comments

Comments
 (0)