Skip to content

Commit 90a8cd4

Browse files
authored
Fix up nolintlint comments and urls (#1164)
1 parent 57e4203 commit 90a8cd4

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.golangci.example.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,9 @@ linters-settings:
243243
allow-leading-space: true
244244
# Exclude following linters from requiring an explanation. Default is [].
245245
allow-no-explanation: []
246-
# Enable to require an explanation after each nolint directive. Default is false.
246+
# Enable to require an explanation of nonzero length after each nolint directive. Default is false.
247247
require-explanation: true
248-
# Enable to require an explanation after each nolint directive. Default is false.
248+
# Enable to require nolint directives to mention the specific linter being suppressed. Default is false.
249249
require-specific: true
250250
rowserrcheck:
251251
packages:

pkg/lint/lintersdb/manager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config {
275275
// nolintlint must be last because it looks at the results of all the previous linters for unused nolint directives
276276
linter.NewConfig(golinters.NewNoLintLint()).
277277
WithPresets(linter.PresetStyle).
278-
WithURL("https://github.com/golangci-lint/pkg/golinters/nolintlint"),
278+
WithURL("https://github.com/golangci/golangci-lint/blob/master/pkg/golinters/nolintlint/README.md"),
279279
}
280280

281281
isLocalRun := os.Getenv("GOLANGCI_COM_RUN") == ""

pkg/result/processors/nolint_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ func TestNolintUnused(t *testing.T) {
258258
return NewNolint(log, dbManager, enabledLintersMap)
259259
}
260260

261-
// the issues below the nolintlint issues that would be generated for the test file
261+
// the issue below is the nolintlint issue that would be generated for the test file
262262
nolintlintIssueVarcheck := result.Issue{
263263
Pos: token.Position{
264264
Filename: fileName,

0 commit comments

Comments
 (0)