Merge branch 'main' into gofuncor

manuelarte · web-flow · commit 9b578c6a504f · 2025-03-26T09:32:59.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,15 @@ If you value it, consider supporting us, we appreciate it! ❤️
 [![Open Collective backers and sponsors](https://img.shields.io/badge/OpenCollective-Donate-blue?logo=opencollective&style=for-the-badge)](https://opencollective.com/golangci-lint)
 [![GitHub Sponsors](https://img.shields.io/badge/GitHub-Donate-blue?logo=github&style=for-the-badge)](https://github.com/sponsors/golangci)
 
+### v2.0.2
+
+1. Misc.
+   * Fixes flags parsing for formatters
+   * Fixes the filepath used by the exclusion `source` option
+2. Documentation
+   * Adds a section about flags migration
+   * Cleaning pages with v1 options
+
 ### v2.0.1
 
 1. Linters/formatters bug fixes
diff --git a/assets/github-action-config-v2.json b/assets/github-action-config-v2.json
diff --git a/docs/src/docs/usage/false-positives.mdx b/docs/src/docs/usage/false-positives.mdx
@@ -122,7 +122,7 @@ var bad_name int //nolint:all
 To exclude issues from specific linters only:
 
 ```go
-var bad_name int //nolint:golint,unused
+var bad_name int //nolint:wsl,unused
 ```
 
 To exclude issues for the block of code use this directive on the beginning of a line:
diff --git a/go.mod b/go.mod
@@ -64,7 +64,7 @@ require (
 	github.com/kisielk/errcheck v1.9.0
 	github.com/kkHAIKE/contextcheck v1.1.6
 	github.com/kulti/thelper v0.6.3
-	github.com/kunwardeep/paralleltest v1.0.10
+	github.com/kunwardeep/paralleltest v1.0.13
 	github.com/lasiar/canonicalheader v1.1.2
 	github.com/ldez/exptostd v0.4.2
 	github.com/ldez/gomoddirectives v0.6.1
diff --git a/go.sum b/go.sum
diff --git a/pkg/result/processors/base_rule.go b/pkg/result/processors/base_rule.go
@@ -83,9 +83,9 @@ func (r *baseRule) matchLinter(issue *result.Issue) bool {
 }
 
 func (r *baseRule) matchSource(issue *result.Issue, lineCache *fsutils.LineCache, log logutils.Log) bool {
-	sourceLine, errSourceLine := lineCache.GetLine(issue.RelativePath, issue.Line())
+	sourceLine, errSourceLine := lineCache.GetLine(issue.FilePath(), issue.Line())
 	if errSourceLine != nil {
-		log.Warnf("Failed to get line %s:%d from line cache: %s", issue.RelativePath, issue.Line(), errSourceLine)
+		log.Warnf("Failed to get line %s:%d from line cache: %s", issue.FilePath(), issue.Line(), errSourceLine)
 		return false // can't properly match
 	}
 
diff --git a/pkg/result/processors/nolint_filter_test.go b/pkg/result/processors/nolint_filter_test.go
@@ -63,7 +63,7 @@ func TestTestNolintFilter_Process(t *testing.T) {
 	processAssertEmpty(t, p, newNolintFileIssue(6, "any"))
 	processAssertEmpty(t, p, newNolintFileIssue(7, "any"))
 
-	processAssertSame(t, p, newNolintFileIssue(1, "golint")) // no directive
+	processAssertSame(t, p, newNolintFileIssue(1, "wsl")) // no directive
 
 	// test preceding comments
 	processAssertEmpty(t, p, newNolintFileIssue(10, "any")) // preceding comment for var
diff --git a/scripts/website/expand_templates/linters.go b/scripts/website/expand_templates/linters.go
@@ -254,7 +254,7 @@ func (e *ExampleSnippetsExtractor) extractExampleSnippets(example []byte) (*Sett
 
 	for j, node := range root.Content {
 		switch node.Value {
-		case "run", "output", keyLinters, keyFormatters, "issues", "severity":
+		case "run", "output", keyLinters, keyFormatters, "issues", "severity", "version":
 		default:
 			continue
 		}
@@ -280,6 +280,11 @@ func (e *ExampleSnippetsExtractor) extractExampleSnippets(example []byte) (*Sett
 			},
 		}
 
+		if node.Value == "version" {
+			node.HeadComment = `See the dedicated "version" documentation section.`
+			newNode = nextNode
+		}
+
 		globalNode.Content = append(globalNode.Content, node, newNode)
 
 		if node.Value == keyLinters || node.Value == keyFormatters {

Original file line number	Diff line number	Diff line change
`@@ -83,9 +83,9 @@ func (r baseRule) matchLinter(issue result.Issue) bool {`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`func (r baseRule) matchSource(issue result.Issue, lineCache *fsutils.LineCache, log logutils.Log) bool {`
`86`		`- sourceLine, errSourceLine := lineCache.GetLine(issue.RelativePath, issue.Line())`
	`86`	`+ sourceLine, errSourceLine := lineCache.GetLine(issue.FilePath(), issue.Line())`
`87`	`87`	`if errSourceLine != nil {`
`88`		`- log.Warnf("Failed to get line %s:%d from line cache: %s", issue.RelativePath, issue.Line(), errSourceLine)`
	`88`	`+ log.Warnf("Failed to get line %s:%d from line cache: %s", issue.FilePath(), issue.Line(), errSourceLine)`
`89`	`89`	`return false // can't properly match`
`90`	`90`	`}`
`91`	`91`