Skip to content

Ensure prompt is displayed to install pylint when user has configured pylint #5356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
karrtikr merged 2 commits into from
Apr 18, 2019
Merged

Ensure prompt is displayed to install pylint when user has configured pylint #5356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4805d4
Corrected bug and added tests
Apr 18, 2019
e3b7b05
News entry
Apr 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions news/2 Fixes/5087.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
No prompt displayed to install pylint
2 changes: 1 addition & 1 deletion src/client/linters/linterInfo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export class PylintLinterInfo extends LinterInfo {
}
// If we're using new LS, then by default Pylint is disabled (unless the user provides a value).
const inspection = this.workspaceService.getConfiguration('python', resource).inspect<boolean>('linting.pylintEnabled');
if (!inspection || (inspection.globalValue === undefined && (inspection.workspaceFolderValue === undefined || inspection.workspaceValue === undefined))) {
if (!inspection || (inspection.globalValue === undefined && (inspection.workspaceFolderValue === undefined && inspection.workspaceValue === undefined))) {
return false;
}
return enabled;
Expand Down
45 changes: 30 additions & 15 deletions src/test/linters/linterinfo.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,22 +53,37 @@ suite('Linter Info - Pylint', () => {

expect(linterInfo.isEnabled()).to.be.false;
});
test('Test enabled when using Language Server and Pylint is configured', async () => {
const config = mock(ConfigurationService);
const workspaceService = mock(WorkspaceService);
const linterInfo = new PylintLinterInfo(instance(config), instance(workspaceService), []);
const testsForisEnabled =
[
{
testName: 'When workspaceFolder setting is provided',
inspection: { workspaceFolderValue: true }
},
{
testName: 'When workspace setting is provided',
inspection: { workspaceValue: true }
},
{
testName: 'When global setting is provided',
inspection: { globalValue: true }
}
];

const inspection = {
globalValue: 'something',
workspaceFolderValue: 'something',
workspaceValue: 'something'
};
const pythonConfig = {
inspect: () => inspection
};
when(config.getSettings(anything())).thenReturn({ linting: { pylintEnabled: true }, jediEnabled: false } as any);
when(workspaceService.getConfiguration('python', anything())).thenReturn(pythonConfig as any);
suite('Test is enabled when using Language Server and Pylint is configured', () => {
Comment thread
karrtikr marked this conversation as resolved.
testsForisEnabled.forEach(testParams => {
test(testParams.testName, async () => {
const config = mock(ConfigurationService);
const workspaceService = mock(WorkspaceService);
const linterInfo = new PylintLinterInfo(instance(config), instance(workspaceService), []);

expect(linterInfo.isEnabled()).to.be.true;
const pythonConfig = {
inspect: () => testParams.inspection
};
when(config.getSettings(anything())).thenReturn({ linting: { pylintEnabled: true }, jediEnabled: false } as any);
when(workspaceService.getConfiguration('python', anything())).thenReturn(pythonConfig as any);

expect(linterInfo.isEnabled()).to.be.true;
});
});
});
});