golangci · ldez · Jul 15, 2022 · Jul 15, 2022 · Jul 15, 2022
diff --git a/pkg/golinters/gofmt_test.go b/pkg/golinters/gofmt_test.go
@@ -310,7 +310,7 @@ index 2c9f78d..c0d5791 100644
 --- a/gofmt.go
 +++ b/gofmt.go
 @@ -1,9 +1,9 @@
- //args: -Egofmt
+ //golangcitest:args -Egofmt
  package p
 
 - func gofmt(a, b int) int {

diff --git a/test/linters_test.go b/test/linters_test.go
@@ -248,7 +248,7 @@ type runContext struct {
 
 func buildConfigFromShortRepr(t *testing.T, repr string, config map[string]interface{}) {
 	kv := strings.Split(repr, "=")
-	require.Len(t, kv, 2)
+	require.Len(t, kv, 2, "repr: %s", repr)
 
 	keyParts := strings.Split(kv[0], ".")
 	require.True(t, len(keyParts) >= 2, len(keyParts))
@@ -308,47 +308,55 @@ func extractRunContextFromComments(t *testing.T, sourcePath string) *runContext
 			continue
 		}
 
-		line = strings.TrimLeft(strings.TrimPrefix(line, "//"), " ")
-		if strings.HasPrefix(line, "args: ") {
+		if !strings.HasPrefix(line, "//golangcitest:") {
+			require.Failf(t, "invalid prefix of comment line %s", line)
+		}
+
+		// TODO(ldez) replace that by strings.Cut when we will drop go1.17
+		var before string
+		var after string
+		if i := strings.Index(line, " "); i >= 0 {
+			before = line[:i]
+			after = strings.TrimSpace(line[i+len(" "):])
+		} else {
+			require.Failf(t, "invalid prefix of comment line %s", line)
+		}
+
+		switch before {
+		case "//golangcitest:args":
 			require.Nil(t, rc.args)
-			args := strings.TrimPrefix(line, "args: ")
-			require.NotEmpty(t, args)
-			rc.args = strings.Split(args, " ")
+			require.NotEmpty(t, after)
+			rc.args = strings.Split(after, " ")
 			continue
-		}
 
-		if strings.HasPrefix(line, "config: ") {
-			repr := strings.TrimPrefix(line, "config: ")
-			require.NotEmpty(t, repr)
+		case "//golangcitest:config":
+			require.NotEmpty(t, after)
 			if rc.config == nil {
 				rc.config = map[string]interface{}{}
 			}
-			buildConfigFromShortRepr(t, repr, rc.config)
+			buildConfigFromShortRepr(t, after, rc.config)
 			continue
-		}
 
-		if strings.HasPrefix(line, "config_path: ") {
-			configPath := strings.TrimPrefix(line, "config_path: ")
-			require.NotEmpty(t, configPath)
-			rc.configPath = configPath
+		case "//golangcitest:config_path":
+			require.NotEmpty(t, after)
+			rc.configPath = after
 			continue
-		}
 
-		if strings.HasPrefix(line, "expected_linter: ") {
-			expectedLinter := strings.TrimPrefix(line, "expected_linter: ")
-			require.NotEmpty(t, expectedLinter)
-			rc.expectedLinter = expectedLinter
+		case "//golangcitest:expected_linter":
+			require.NotEmpty(t, after)
+			rc.expectedLinter = after
 			continue
-		}
 
-		require.Fail(t, "invalid prefix of comment line %s", line)
+		default:
+			require.Failf(t, "invalid prefix of comment line %s", line)
+		}
 	}
 
 	// guess the expected linter if none is specified
 	if rc.expectedLinter == "" {
 		for _, arg := range rc.args {
 			if strings.HasPrefix(arg, "-E") && !strings.Contains(arg, ",") {
-				require.Empty(t, rc.expectedLinter, "could not infer expected linter for errors because multiple linters are enabled. Please use the `expected_linter: ` directive in your test to indicate the linter-under-test.") //nolint:lll
+				require.Empty(t, rc.expectedLinter, "could not infer expected linter for errors because multiple linters are enabled. Please use the `//golangcitest:expected_linter ` directive in your test to indicate the linter-under-test.") //nolint:lll
 				rc.expectedLinter = arg[2:]
 			}
 		}

diff --git a/test/testdata/asciicheck.go b/test/testdata/asciicheck.go
@@ -1,4 +1,4 @@
-//args: -Easciicheck
+//golangcitest:args -Easciicheck
 package testdata
 
 import (

diff --git a/test/testdata/bidichk.go b/test/testdata/bidichk.go
@@ -1,4 +1,4 @@
-//args: -Ebidichk
+//golangcitest:args -Ebidichk
 package testdata
 
 import "fmt"

diff --git a/test/testdata/bodyclose.go b/test/testdata/bodyclose.go
@@ -1,4 +1,4 @@
-//args: -Ebodyclose
+//golangcitest:args -Ebodyclose
 package testdata
 
 import (

diff --git a/test/testdata/containedctx.go b/test/testdata/containedctx.go
@@ -1,4 +1,4 @@
-// args: -Econtainedctx
+//golangcitest:args -Econtainedctx
 package testdata
 
 import "context"

diff --git a/test/testdata/contextcheck.go b/test/testdata/contextcheck.go
@@ -1,4 +1,4 @@
-//args: -Econtextcheck
+//golangcitest:args -Econtextcheck
 package testdata
 
 import "context"

diff --git a/test/testdata/cyclop.go b/test/testdata/cyclop.go
@@ -1,5 +1,5 @@
-//args: -Ecyclop
-//config: linters-settings.cyclop.max-complexity=15
+//golangcitest:args -Ecyclop
+//golangcitest:config linters-settings.cyclop.max-complexity=15
 package testdata
 
 func cyclopComplexFunc(s string) { // ERROR "calculated cyclomatic complexity for function cyclopComplexFunc is 22, max is 15"

diff --git a/test/testdata/deadcode.go b/test/testdata/deadcode.go
@@ -1,4 +1,4 @@
-//args: -Edeadcode
+//golangcitest:args -Edeadcode
 package testdata
 
 var y int

diff --git a/test/testdata/decorder.go b/test/testdata/decorder.go
@@ -1,5 +1,5 @@
-// args: -Edecorder
-// config_path: testdata/configs/decorder.yml
+//golangcitest:args -Edecorder
+//golangcitest:config_path testdata/configs/decorder.yml
 package testdata
 
 import "math"

diff --git a/test/testdata/decorder_default.go b/test/testdata/decorder_default.go
@@ -1,4 +1,4 @@
-// args: -Edecorder
+//golangcitest:args -Edecorder
 package testdata
 
 import "math"

diff --git a/test/testdata/default_exclude.go b/test/testdata/default_exclude.go
@@ -1,5 +1,5 @@
-//args: -Estylecheck,golint --internal-cmd-test
-//config_path: testdata/configs/default_exclude.yml
+//golangcitest:args -Estylecheck,golint --internal-cmd-test
+//golangcitest:config_path testdata/configs/default_exclude.yml
 
 /*Package testdata ...*/
 package testdata

diff --git a/test/testdata/depguard.go b/test/testdata/depguard.go
@@ -1,5 +1,5 @@
-//args: -Edepguard
-//config_path: testdata/configs/depguard.yml
+//golangcitest:args -Edepguard
+//golangcitest:config_path testdata/configs/depguard.yml
 package testdata
 
 import (

diff --git a/test/testdata/depguard_additional_guards.go b/test/testdata/depguard_additional_guards.go
@@ -1,5 +1,5 @@
-//args: -Edepguard
-//config_path: testdata/configs/depguard_additional_guards.yml
+//golangcitest:args -Edepguard
+//golangcitest:config_path testdata/configs/depguard_additional_guards.yml
 package testdata
 
 import (

diff --git a/test/testdata/depguard_ignore_file_rules.go b/test/testdata/depguard_ignore_file_rules.go
@@ -1,5 +1,5 @@
-//args: -Edepguard
-//config_path: testdata/configs/depguard_ignore_file_rules.yml
+//golangcitest:args -Edepguard
+//golangcitest:config_path testdata/configs/depguard_ignore_file_rules.yml
 package testdata
 
 // NOTE - No lint errors becuase this file is ignored

diff --git a/test/testdata/dogsled.go b/test/testdata/dogsled.go
@@ -1,4 +1,4 @@
-//args: -Edogsled
+//golangcitest:args -Edogsled
 package testdata
 
 func Dogsled() {

diff --git a/test/testdata/dupl.go b/test/testdata/dupl.go
@@ -1,5 +1,5 @@
-//args: -Edupl
-//config: linters-settings.dupl.threshold=20
+//golangcitest:args -Edupl
+//golangcitest:config linters-settings.dupl.threshold=20
 package testdata
 
 type DuplLogger struct{}

diff --git a/test/testdata/durationcheck.go b/test/testdata/durationcheck.go
@@ -1,4 +1,4 @@
-//args: -Edurationcheck
+//golangcitest:args -Edurationcheck
 package testdata
 
 import (

diff --git a/test/testdata/errcheck.go b/test/testdata/errcheck.go
@@ -1,4 +1,4 @@
-//args: -Eerrcheck
+//golangcitest:args -Eerrcheck
 package testdata
 
 import (

diff --git a/test/testdata/errcheck_exclude.go b/test/testdata/errcheck_exclude.go
@@ -1,6 +1,6 @@
-//args: -Eerrcheck
-//config: linters-settings.errcheck.check-blank=true
-//config: linters-settings.errcheck.exclude=testdata/errcheck/exclude.txt
+//golangcitest:args -Eerrcheck
+//golangcitest:config linters-settings.errcheck.check-blank=true
+//golangcitest:config linters-settings.errcheck.exclude=testdata/errcheck/exclude.txt
 package testdata
 
 import (

diff --git a/test/testdata/errcheck_exclude_functions.go b/test/testdata/errcheck_exclude_functions.go
@@ -1,5 +1,5 @@
-//args: -Eerrcheck
-//config_path: testdata/errcheck/exclude_functions.yml
+//golangcitest:args -Eerrcheck
+//golangcitest:config_path testdata/errcheck/exclude_functions.yml
 package testdata
 
 import (

diff --git a/test/testdata/errcheck_ignore.go b/test/testdata/errcheck_ignore.go
@@ -1,5 +1,5 @@
-//args: -Eerrcheck
-//config_path: testdata/errcheck/ignore_config.yml
+//golangcitest:args -Eerrcheck
+//golangcitest:config_path testdata/errcheck/ignore_config.yml
 package testdata
 
 import (

diff --git a/test/testdata/errcheck_ignore_default.go b/test/testdata/errcheck_ignore_default.go
@@ -1,5 +1,5 @@
-//args: -Eerrcheck
-//config: linters-settings.errcheck.check-blank=true
+//golangcitest:args -Eerrcheck
+//golangcitest:config linters-settings.errcheck.check-blank=true
 package testdata
 
 import (

diff --git a/test/testdata/errcheck_type_assertions.go b/test/testdata/errcheck_type_assertions.go
@@ -1,5 +1,5 @@
-//args: -Eerrcheck
-//config: linters-settings.errcheck.check-type-assertions=true
+//golangcitest:args -Eerrcheck
+//golangcitest:config linters-settings.errcheck.check-type-assertions=true
 package testdata
 
 func ErrorTypeAssertion(filter map[string]interface{}) bool {

diff --git a/test/testdata/errchkjson.go b/test/testdata/errchkjson.go
@@ -1,5 +1,5 @@
-// args: -Eerrchkjson
-// config_path: testdata/configs/errchkjson.yml
+//golangcitest:args -Eerrchkjson
+//golangcitest:config_path testdata/configs/errchkjson.yml
 package testdata
 
 import (

diff --git a/test/testdata/errchkjson_check_error_free_encoding.go b/test/testdata/errchkjson_check_error_free_encoding.go
@@ -1,5 +1,5 @@
-// args: -Eerrchkjson
-// config_path: testdata/configs/errchkjson_check_error_free_encoding.yml
+//golangcitest:args -Eerrchkjson
+//golangcitest:config_path testdata/configs/errchkjson_check_error_free_encoding.yml
 package testdata
 
 import (

diff --git a/test/testdata/errchkjson_no_exported.go b/test/testdata/errchkjson_no_exported.go
@@ -1,5 +1,5 @@
-// args: -Eerrchkjson
-// config_path: testdata/configs/errchkjson_no_exported.yml
+//golangcitest:args -Eerrchkjson
+//golangcitest:config_path testdata/configs/errchkjson_no_exported.yml
 package testdata
 
 import (

diff --git a/test/testdata/errname.go b/test/testdata/errname.go
@@ -1,4 +1,4 @@
-//args: -Eerrname
+//golangcitest:args -Eerrname
 package testdata
 
 import (

diff --git a/test/testdata/errorlint.go b/test/testdata/errorlint.go
@@ -1,4 +1,4 @@
-//args: -Eerrorlint
+//golangcitest:args -Eerrorlint
 package testdata
 
 import (

diff --git a/test/testdata/errorlint_asserts.go b/test/testdata/errorlint_asserts.go
@@ -1,5 +1,5 @@
-//args: -Eerrorlint
-//config_path: testdata/configs/errorlint_asserts.yml
+//golangcitest:args -Eerrorlint
+//golangcitest:config_path testdata/configs/errorlint_asserts.yml
 package testdata
 
 import (

diff --git a/test/testdata/errorlint_comparison.go b/test/testdata/errorlint_comparison.go
@@ -1,5 +1,5 @@
-//args: -Eerrorlint
-//config_path: testdata/configs/errorlint_comparison.yml
+//golangcitest:args -Eerrorlint
+//golangcitest:config_path testdata/configs/errorlint_comparison.yml
 package testdata
 
 import (

diff --git a/test/testdata/errorlint_errorf.go b/test/testdata/errorlint_errorf.go
@@ -1,5 +1,5 @@
-//args: -Eerrorlint
-//config_path: testdata/configs/errorlint_errorf.yml
+//golangcitest:args -Eerrorlint
+//golangcitest:config_path testdata/configs/errorlint_errorf.yml
 package testdata
 
 import (

diff --git a/test/testdata/execinquery.go b/test/testdata/execinquery.go
@@ -1,4 +1,4 @@
-// args: -Eexecinquery
+//golangcitest:args -Eexecinquery
 package testdata
 
 import (

diff --git a/test/testdata/exhaustive.go b/test/testdata/exhaustive.go
@@ -1,4 +1,4 @@
-//args: -Eexhaustive
+//golangcitest:args -Eexhaustive
 package testdata
 
 type Direction int

diff --git a/test/testdata/exhaustive_default.go b/test/testdata/exhaustive_default.go
@@ -1,5 +1,5 @@
-//args: -Eexhaustive
-//config_path: testdata/configs/exhaustive_default.yml
+//golangcitest:args -Eexhaustive
+//golangcitest:config_path testdata/configs/exhaustive_default.yml
 package testdata
 
 type Direction int

diff --git a/test/testdata/exhaustive_generated.go b/test/testdata/exhaustive_generated.go
diff --git a/test/testdata/exhaustive_ignore_enum_members.go b/test/testdata/exhaustive_ignore_enum_members.go
@@ -1,5 +1,5 @@
-//args: -Eexhaustive
-//config_path: testdata/configs/exhaustive_ignore_enum_members.yml
+//golangcitest:args -Eexhaustive
+//golangcitest:config_path testdata/configs/exhaustive_ignore_enum_members.yml
 package testdata
 
 type Direction int

diff --git a/test/testdata/exhaustivestruct.go b/test/testdata/exhaustivestruct.go
@@ -1,4 +1,4 @@
-// args: -Eexhaustivestruct --internal-cmd-test
+//golangcitest:args -Eexhaustivestruct --internal-cmd-test
 package testdata
 
 import "time"

diff --git a/test/testdata/exhaustivestruct_custom.go b/test/testdata/exhaustivestruct_custom.go
@@ -1,5 +1,5 @@
-// args: -Eexhaustivestruct --internal-cmd-test
-// config_path: testdata/configs/exhaustivestruct.yml
+//golangcitest:args -Eexhaustivestruct --internal-cmd-test
+//golangcitest:config_path testdata/configs/exhaustivestruct.yml
 package testdata
 
 import "time"

diff --git a/test/testdata/exhaustruct.go b/test/testdata/exhaustruct.go
@@ -1,4 +1,4 @@
-// args: -Eexhaustruct
+//golangcitest:args -Eexhaustruct
 package testdata
 
 import "time"

diff --git a/test/testdata/exhaustruct_custom.go b/test/testdata/exhaustruct_custom.go
@@ -1,5 +1,5 @@
-// args: -Eexhaustruct
-// config_path: testdata/configs/exhaustruct.yml
+//golangcitest:args -Eexhaustruct
+//golangcitest:config_path testdata/configs/exhaustruct.yml
 package testdata
 
 import "time"

diff --git a/test/testdata/exportloopref.go b/test/testdata/exportloopref.go
@@ -1,4 +1,4 @@
-//args: -Eexportloopref
+//golangcitest:args -Eexportloopref
 package testdata
 
 import "fmt"

diff --git a/test/testdata/fix/in/gci.go b/test/testdata/fix/in/gci.go
@@ -1,5 +1,5 @@
-//args: -Egci
-//config_path: testdata/configs/gci.yml
+//golangcitest:args -Egci
+//golangcitest:config_path testdata/configs/gci.yml
 package gci
 
 import (

diff --git a/test/testdata/fix/in/gocritic.go b/test/testdata/fix/in/gocritic.go
@@ -1,5 +1,5 @@
-// args: -Egocritic
-// config_path: testdata/configs/gocritic-fix.yml
+//golangcitest:args -Egocritic
+//golangcitest:config_path testdata/configs/gocritic-fix.yml
 package p
 
 import (