Skip to content

Commit d767aa0

Browse files
stamblerrehyangah
authored andcommitted
[release] src/goCheck: add missing goplsConfig parameter to goLint
Fixes #1429 Change-Id: I402a29e4dfe95aaa76b8ca852c03c6e3d73eb96c Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/310755 Trust: Rebecca Stambler <[email protected]> Run-TryBot: Rebecca Stambler <[email protected]> Reviewed-by: Hyang-Ah Hana Kim <[email protected]> (cherry picked from commit 10509fb) Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/311451 Trust: Hyang-Ah Hana Kim <[email protected]> Run-TryBot: Hyang-Ah Hana Kim <[email protected]> TryBot-Result: kokoro <[email protected]> Reviewed-by: Suzy Mueller <[email protected]>
1 parent db72703 commit d767aa0

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/goCheck.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import path = require('path');
1111
import vscode = require('vscode');
12+
import { getGoplsConfig } from './config';
1213
import { goBuild } from './goBuild';
1314
import { buildLanguageServerConfig } from './goLanguageServer';
1415
import { goLint } from './goLint';
@@ -109,8 +110,9 @@ export function check(fileUri: vscode.Uri, goConfig: vscode.WorkspaceConfigurati
109110
}
110111

111112
if (!!goConfig['lintOnSave'] && goConfig['lintOnSave'] !== 'off') {
113+
const goplsConfig = getGoplsConfig(fileUri);
112114
runningToolsPromises.push(
113-
goLint(fileUri, goConfig, goConfig['lintOnSave']).then((errors) => ({
115+
goLint(fileUri, goConfig, goplsConfig, goConfig['lintOnSave']).then((errors) => ({
114116
diagnosticCollection: lintDiagnosticCollection,
115117
errors
116118
}))

0 commit comments

Comments
 (0)