[vscode-go] src/goTools.ts: disable lint tool if 'staticcheck' is true

[Suzy Mueller (Gerrit)]

Suzy Mueller submitted this change.

View Change

Approvals: Hyang-Ah Hana Kim: Looks good to me, approved Suzy Mueller: Trusted; Run TryBots kokoro: TryBots succeeded

src/goTools.ts: disable lint tool if 'staticcheck' is true

This checks both the values of 'ui.diagnostic.staticcheck' as well as
'staticcheck' to properly turn off the linting tools.

Fixes golang/vscode-go#1867

Change-Id: Ic50b675b40a5d7181e7053c3408e35c8734112e1
Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/361794
Trust: Suzy Mueller <suz...@golang.org>
Run-TryBot: Suzy Mueller <suz...@golang.org>
Reviewed-by: Hyang-Ah Hana Kim <hya...@gmail.com>
TryBot-Result: kokoro <noreply...@google.com>
---
M src/goTools.ts
1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/goTools.ts b/src/goTools.ts
index d6eba5a..a14420d 100644
--- a/src/goTools.ts
+++ b/src/goTools.ts
@@ -208,7 +208,11 @@
 	goConfig: { [key: string]: any },
 	goplsConfig: { [key: string]: any }
 ): boolean {
-	if (goConfig['useLanguageServer'] !== true || goplsConfig['ui.diagnostic.staticcheck'] !== true) {
+	if (
+		goConfig['useLanguageServer'] !== true ||
+		goplsConfig['ui.diagnostic.staticcheck'] === false ||
+		(goplsConfig['ui.diagnostic.staticcheck'] === undefined && goplsConfig['staticcheck'] !== true)
+	) {
 		return false;
 	}
 	const features = goConfig['languageServerExperimentalFeatures'];

To view, visit change 361794. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: vscode-go

Gerrit-Branch: master

Gerrit-Change-Id: Ic50b675b40a5d7181e7053c3408e35c8734112e1

Gerrit-Change-Number: 361794

Gerrit-PatchSet: 2

Gerrit-Owner: Suzy Mueller <suz...@golang.org>

Gerrit-Reviewer: Hyang-Ah Hana Kim <hya...@gmail.com>

Gerrit-Reviewer: Suzy Mueller <suz...@golang.org>

Gerrit-Reviewer: kokoro <noreply...@google.com>

Gerrit-MessageType: merged