Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix up nolintlint comments and urls #1164

Merged
merged 1 commit into from May 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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