Fix linting.pylintEnabled setting check (microsoft#12444)

kimadeline · web-flow · commit 65f9709b2955 · 2020-06-22T11:16:13.000-07:00
* Fix `linting.pylintEnabled` setting check
* Use stub instead of handspun variable
diff --git a/news/2 Fixes/12285.md b/news/2 Fixes/12285.md
@@ -0,0 +1 @@
+Fix `linting.pylintEnabled` setting check.
diff --git a/src/client/linters/linterInfo.ts b/src/client/linters/linterInfo.ts
@@ -99,7 +99,7 @@ export class PylintLinterInfo extends LinterInfo {
         // If we're using LS, then by default Pylint is disabled unless user provided
         // the value. We have to resort to direct inspection of settings here.
         const configuration = this.workspaceService.getConfiguration('python', resource);
-        const inspection = configuration.inspect<boolean>(this.enabledSettingName);
+        const inspection = configuration.inspect<boolean>(`linting.${this.enabledSettingName}`);
         if (
             !inspection ||
             (inspection.globalValue === undefined &&
diff --git a/src/test/linters/linterinfo.unit.test.ts b/src/test/linters/linterinfo.unit.test.ts
@@ -6,6 +6,7 @@
 // tslint:disable:chai-vague-errors no-unused-expression max-func-body-length no-any
 
 import { expect } from 'chai';
+import * as sinon from 'sinon';
 import { anything, instance, mock, when } from 'ts-mockito';
 import { LanguageServerType } from '../../client/activation/types';
 import { WorkspaceService } from '../../client/common/application/workspace';
@@ -62,6 +63,22 @@ suite('Linter Info - Pylint', () => {
 
         expect(linterInfo.isEnabled()).to.be.false;
     });
+    test('Should inspect the value of linting.pylintEnabled when using Language Server', async () => {
+        const linterInfo = new PylintLinterInfo(instance(config), instance(workspace), []);
+        const inspectStub = sinon.stub();
+        const pythonConfig = {
+            inspect: inspectStub
+        };
+
+        when(config.getSettings(anything())).thenReturn({
+            linting: { pylintEnabled: true },
+            languageServer: LanguageServerType.Microsoft
+        } as any);
+        when(workspace.getConfiguration('python', anything())).thenReturn(pythonConfig as any);
+
+        expect(linterInfo.isEnabled()).to.be.false;
+        expect(inspectStub.calledOnceWith('linting.pylintEnabled')).to.be.true;
+    });
     const testsForisEnabled = [
         {
             testName: 'When workspaceFolder setting is provided',

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix `linting.pylintEnabled` setting check.