Skip to content

Commit

Permalink
Fix up nolintlint comments and urls (#1164)
Browse files Browse the repository at this point in the history
  • Loading branch information
ashanbrown committed May 24, 2020
1 parent 57e4203 commit 90a8cd4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .golangci.example.yml
Expand Up @@ -243,9 +243,9 @@ linters-settings:
allow-leading-space: true
# Exclude following linters from requiring an explanation. Default is [].
allow-no-explanation: []
# Enable to require an explanation after each nolint directive. Default is false.
# Enable to require an explanation of nonzero length after each nolint directive. Default is false.
require-explanation: true
# Enable to require an explanation after each nolint directive. Default is false.
# Enable to require nolint directives to mention the specific linter being suppressed. Default is false.
require-specific: true
rowserrcheck:
packages:
Expand Down
2 changes: 1 addition & 1 deletion pkg/lint/lintersdb/manager.go
Expand Up @@ -275,7 +275,7 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config {
// nolintlint must be last because it looks at the results of all the previous linters for unused nolint directives
linter.NewConfig(golinters.NewNoLintLint()).
WithPresets(linter.PresetStyle).
WithURL("https://github.com/golangci-lint/pkg/golinters/nolintlint"),
WithURL("https://github.com/golangci/golangci-lint/blob/master/pkg/golinters/nolintlint/README.md"),
}

isLocalRun := os.Getenv("GOLANGCI_COM_RUN") == ""
Expand Down
2 changes: 1 addition & 1 deletion pkg/result/processors/nolint_test.go
Expand Up @@ -258,7 +258,7 @@ func TestNolintUnused(t *testing.T) {
return NewNolint(log, dbManager, enabledLintersMap)
}

// the issues below the nolintlint issues that would be generated for the test file
// the issue below is the nolintlint issue that would be generated for the test file
nolintlintIssueVarcheck := result.Issue{
Pos: token.Position{
Filename: fileName,
Expand Down

0 comments on commit 90a8cd4

Please sign in to comment.