build(deps): bump github.com/denis-tingaikin/go-headerfrom 0.4.3 to 0…

….5.0 (golangci#4396) Co-authored-by: Fernandez Ludovic <ldez@users.noreply.github.com>
Antonboom · Mar 3, 2024 · cf7de0f · cf7de0f
1 parent 8dab491
commit cf7de0f
Show file tree

Hide file tree

Showing 12 changed files with 81 additions and 4 deletions.
diff --git a/go.mod b/go.mod
@@ -32,7 +32,7 @@ require (
 	github.com/ckaznocha/intrange v0.1.0
 	github.com/curioswitch/go-reassign v0.2.0
 	github.com/daixiang0/gci v0.12.3
-	github.com/denis-tingaikin/go-header v0.4.3
+	github.com/denis-tingaikin/go-header v0.5.0
 	github.com/esimonov/ifshort v1.0.4
 	github.com/fatih/color v1.16.0
 	github.com/firefart/nonamedreturns v1.0.4

diff --git a/go.sum b/go.sum
diff --git a/pkg/golinters/goheader.go b/pkg/golinters/goheader.go
@@ -97,6 +97,17 @@ func runGoHeader(pass *analysis.Pass, conf *goheader.Configuration) ([]goanalysi
 			FromLinter: goHeaderName,
 		}
 
+		if fix := i.Fix(); fix != nil {
+			issue.LineRange = &result.Range{
+				From: issue.Line(),
+				To:   issue.Line() + len(fix.Actual) - 1,
+			}
+			issue.Replacement = &result.Replacement{
+				NeedOnlyDelete: len(fix.Expected) == 0,
+				NewLines:       fix.Expected,
+			}
+		}
+
 		issues = append(issues, goanalysis.NewIssue(&issue, pass))
 	}
 

diff --git a/pkg/lint/lintersdb/manager.go b/pkg/lint/lintersdb/manager.go
@@ -486,6 +486,7 @@ func (m *Manager) GetAllSupportedLinterConfigs() []*linter.Config {
 		linter.NewConfig(golinters.NewGoHeader(goheaderCfg)).
 			WithSince("v1.28.0").
 			WithPresets(linter.PresetStyle).
+			WithAutoFix().
 			WithURL("https://github.com/denis-tingaikin/go-header"),
 
 		linter.NewConfig(golinters.NewGoimports(goimportsCfg)).

diff --git a/test/testdata/configs/go-header-fix.yml b/test/testdata/configs/go-header-fix.yml
@@ -0,0 +1,9 @@
+linters-settings:
+  goheader:
+    values:
+      const:
+        AUTHOR: The Awesome Project Authors
+    template: |-
+      Copyright 2024 {{ AUTHOR }}
+
+      Use of this source code is governed by LICENSE
diff --git a/test/testdata/fix/in/go-header_1.go b/test/testdata/fix/in/go-header_1.go
@@ -0,0 +1,6 @@
+// Copyright 1999 The Awesome Project Authors
+
+//golangcitest:args -Egoheader
+//golangcitest:expected_exitcode 0
+//golangcitest:config_path testdata/configs/go-header-fix.yml
+package p
diff --git a/test/testdata/fix/in/go-header_2.go b/test/testdata/fix/in/go-header_2.go
@@ -0,0 +1,8 @@
+/* Copyright 1999 The Awesome Project Authors
+
+Use of this source code is governed */
+
+//golangcitest:args -Egoheader
+//golangcitest:expected_exitcode 0
+//golangcitest:config_path testdata/configs/go-header-fix.yml
+package p
diff --git a/test/testdata/fix/in/go-header_3.go b/test/testdata/fix/in/go-header_3.go
@@ -0,0 +1,10 @@
+/*
+Copyright 1999 The Awesome
+
+Use of this source code is governed by LICENSE
+*/
+
+//golangcitest:args -Egoheader
+//golangcitest:expected_exitcode 0
+//golangcitest:config_path testdata/configs/go-header-fix.yml
+package p
diff --git a/test/testdata/fix/out/go-header_1.go b/test/testdata/fix/out/go-header_1.go
@@ -0,0 +1,8 @@
+// Copyright 2024 The Awesome Project Authors
+// 
+// Use of this source code is governed by LICENSE
+
+//golangcitest:args -Egoheader
+//golangcitest:expected_exitcode 0
+//golangcitest:config_path testdata/configs/go-header-fix.yml
+package p
diff --git a/test/testdata/fix/out/go-header_2.go b/test/testdata/fix/out/go-header_2.go
@@ -0,0 +1,8 @@
+/* Copyright 2024 The Awesome Project Authors
+
+Use of this source code is governed by LICENSE */
+
+//golangcitest:args -Egoheader
+//golangcitest:expected_exitcode 0
+//golangcitest:config_path testdata/configs/go-header-fix.yml
+package p
diff --git a/test/testdata/fix/out/go-header_3.go b/test/testdata/fix/out/go-header_3.go
@@ -0,0 +1,10 @@
+/*
+Copyright 2024 The Awesome Project Authors
+
+Use of this source code is governed by LICENSE
+*/
+
+//golangcitest:args -Egoheader
+//golangcitest:expected_exitcode 0
+//golangcitest:config_path testdata/configs/go-header-fix.yml
+package p
diff --git a/test/testshared/directives.go b/test/testshared/directives.go
@@ -59,7 +59,13 @@ func ParseTestDirectives(tb testing.TB, sourcePath string) *RunContext {
 			continue
 		}
 
-		if !strings.HasPrefix(line, "//golangcitest:") {
+		switch {
+		case strings.HasPrefix(line, "//golangcitest:"):
+			// Ok
+		case !strings.Contains(line, "golangcitest"):
+			// Assume this is a regular comment (required for go-header tests)
+			continue
+		default:
 			require.Failf(tb, "invalid prefix of comment line %s", line)
 		}