Merge branch 'master' into add-new-linter-ttempdir

Author: peczenyj

.golangci.next.reference.yml

@@ -2192,13 +2192,16 @@ linters-settings:
       - error-nil
       - expected-actual
       - float-compare
+      - formatter
       - go-require
       - len
       - negative-positive
       - nil-compare
       - require-error
+      - suite-broken-parallel
       - suite-dont-use-pkg
       - suite-extra-assert-call
+      - suite-subtest-run
       - suite-thelper
       - useless-assert
 
@@ -2208,7 +2211,8 @@ linters-settings:
     # Enable checkers by name
     # (in addition to default
     #   blank-import, bool-compare, compares, empty, error-is-as, error-nil, expected-actual, go-require, float-compare,
-    #   len, negative-positive, nil-compare, require-error, suite-dont-use-pkg, suite-extra-assert-call, useless-assert
+    #   formatter, len, negative-positive, nil-compare, require-error, suite-broken-parallel, suite-dont-use-pkg,
+    #   suite-extra-assert-call, suite-subtest-run, useless-assert
     # ).
     enable:
       - blank-import
@@ -2219,13 +2223,16 @@ linters-settings:
       - error-nil
       - expected-actual
       - float-compare
+      - formatter
       - go-require
       - len
       - negative-positive
       - nil-compare
       - require-error
+      - suite-broken-parallel
       - suite-dont-use-pkg
       - suite-extra-assert-call
+      - suite-subtest-run
       - suite-thelper
       - useless-assert
 
@@ -2237,6 +2244,13 @@ linters-settings:
       # Regexp for expected variable name.
       # Default: (^(exp(ected)?|want(ed)?)([A-Z]\w*)?$)|(^(\w*[a-z])?(Exp(ected)?|Want(ed)?)$)
       pattern: ^expected
+    formatter:
+      # To enable go vet's printf checks.
+      # Default: true
+      check-format-string: false
+      # To require f-assertions if format string is used.
+      # Default: false
+      require-f-funcs: true
     go-require:
       # To ignore HTTP handlers (like http.HandlerFunc).
       # Default: false

CHANGELOG.md

@@ -1,5 +1,22 @@
 Follow the news and releases on [Mastodon](https://fosstodon.org/@golangcilint) and on [Twitter](https://twitter.com/golangci).
 
+### v1.59.1
+
+1. Updated linters
+   * `go-errorlint`: from 1.5.1 to 1.5.2
+   * `gomnd`: deprecated configuration compatibility
+   * `intrange`: add `style` preset
+   * `misspell`: from 0.5.1 to 0.6.0
+   * `sloglint`: from 0.7.0 to 0.7.1
+   * `testifylint`: from 1.3.0 to 1.3.1
+   * `unparam`: bump to HEAD
+   * `usestdlibvars`: from 1.25.0 to 1.26.0
+2. Fixes
+   * SARIF: init empty result slice
+   * SARIF: issue column >= 1
+3. Documentation
+   * update `revive` configuration
+
 ### v1.59.0
 
 1. Enhancements

assets/github-action-config.json

@@ -1,8 +1,8 @@
 {
   "MinorVersionToConfig": {
     "latest": {
-      "TargetVersion": "v1.59.0",
-      "AssetURL": "https://github.com/golangci/golangci-lint/releases/download/v1.59.0/golangci-lint-1.59.0-linux-amd64.tar.gz"
+      "TargetVersion": "v1.59.1",
+      "AssetURL": "https://github.com/golangci/golangci-lint/releases/download/v1.59.1/golangci-lint-1.59.1-linux-amd64.tar.gz"
     },
     "v1.10": {
       "Error": "golangci-lint version 'v1.10' isn't supported: we support only v1.14.0 and later versions"
@@ -206,8 +206,8 @@
       "AssetURL": "https://github.com/golangci/golangci-lint/releases/download/v1.58.2/golangci-lint-1.58.2-linux-amd64.tar.gz"
     },
     "v1.59": {
-      "TargetVersion": "v1.59.0",
-      "AssetURL": "https://github.com/golangci/golangci-lint/releases/download/v1.59.0/golangci-lint-1.59.0-linux-amd64.tar.gz"
+      "TargetVersion": "v1.59.1",
+      "AssetURL": "https://github.com/golangci/golangci-lint/releases/download/v1.59.1/golangci-lint-1.59.1-linux-amd64.tar.gz"
     },
     "v1.6": {
       "Error": "golangci-lint version 'v1.6' isn't supported: we support only v1.14.0 and later versions"

assets/linters-info.json

@@ -749,6 +749,9 @@
     "name": "intrange",
     "desc": "intrange is a linter to find places where for loops could make use of an integer range.",
     "loadMode": 7,
+    "inPresets": [
+      "style"
+    ],
     "originalURL": "https://github.com/ckaznocha/intrange",
     "internal": false,
     "isSlow": false,

go.mod

@@ -9,11 +9,11 @@ require (
 	github.com/Abirdcfly/dupword v0.0.14
 	github.com/Antonboom/errname v0.1.13
 	github.com/Antonboom/nilnil v0.1.9
-	github.com/Antonboom/testifylint v1.3.1
+	github.com/Antonboom/testifylint v1.4.1
 	github.com/BurntSushi/toml v1.4.0
-	github.com/Crocmagnon/fatcontext v0.2.2
+	github.com/Crocmagnon/fatcontext v0.3.0
 	github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24
-	github.com/GaijinEntertainment/go-exhaustruct/v3 v3.2.0
+	github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0
 	github.com/OpenPeeDeeP/depguard/v2 v2.2.0
 	github.com/alecthomas/go-check-sumtype v0.1.4
 	github.com/alexkohler/nakedret/v2 v2.0.4
@@ -23,7 +23,7 @@ require (
 	github.com/ashanbrown/makezero v1.1.1
 	github.com/bkielbasa/cyclop v1.2.1
 	github.com/blizzy78/varnamelen v0.8.0
-	github.com/bombsimon/wsl/v4 v4.2.1
+	github.com/bombsimon/wsl/v4 v4.4.0
 	github.com/breml/bidichk v0.2.7
 	github.com/breml/errchkjson v0.3.6
 	github.com/butuzov/ireturn v0.3.0
@@ -44,7 +44,7 @@ require (
 	github.com/gofrs/flock v0.8.1
 	github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a
 	github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e
-	github.com/golangci/misspell v0.5.1
+	github.com/golangci/misspell v0.6.0
 	github.com/golangci/modinfo v0.3.4
 	github.com/golangci/plugin-module-register v0.1.1
 	github.com/golangci/revgrep v0.5.3
@@ -92,7 +92,7 @@ require (
 	github.com/sanposhiho/wastedassign/v2 v2.0.7
 	github.com/santhosh-tekuri/jsonschema/v5 v5.3.1
 	github.com/sashamelentyev/interfacebloat v1.1.0
-	github.com/sashamelentyev/usestdlibvars v1.25.0
+	github.com/sashamelentyev/usestdlibvars v1.26.0
 	github.com/securego/gosec/v2 v2.20.1-0.20240525090044-5f0084eb01a9
 	github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c
 	github.com/shirou/gopsutil/v3 v3.24.5

go.sum

@@ -2887,13 +2887,16 @@
                   "error-nil",
                   "expected-actual",
                   "float-compare",
+                  "formatter",
                   "go-require",
                   "len",
                   "negative-positive",
                   "nil-compare",
                   "require-error",
+                  "suite-broken-parallel",
                   "suite-dont-use-pkg",
                   "suite-extra-assert-call",
+                  "suite-subtest-run",
                   "suite-thelper",
                   "useless-assert"
                 ]
@@ -2907,13 +2910,16 @@
                 "error-nil",
                 "expected-actual",
                 "float-compare",
+                "float-compare",
                 "go-require",
                 "len",
                 "negative-positive",
                 "nil-compare",
                 "require-error",
+                "suite-broken-parallel",
                 "suite-dont-use-pkg",
                 "suite-extra-assert-call",
+                "suite-subtest-run",
                 "useless-assert"
               ]
             },
@@ -2930,13 +2936,16 @@
                   "error-nil",
                   "expected-actual",
                   "float-compare",
+                  "formatter",
                   "go-require",
                   "len",
                   "negative-positive",
                   "nil-compare",
                   "require-error",
+                  "suite-broken-parallel",
                   "suite-dont-use-pkg",
                   "suite-extra-assert-call",
+                  "suite-subtest-run",
                   "suite-thelper",
                   "useless-assert"
                 ],
@@ -2967,6 +2976,22 @@
                 }
               }
             },
+            "formatter": {
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                "check-format-string": {
+                  "description": "To enable go vet's printf checks.",
+                  "type": "boolean",
+                  "default": true
+                },
+                "require-f-funcs": {
+                  "description": "To require f-assertions if format string is used.",
+                  "type": "boolean",
+                  "default": false
+                }
+              }
+            },
             "go-require": {
               "type": "object",
               "additionalProperties": false,

jsonschema/golangci.next.jsonschema.json

@@ -880,6 +880,11 @@ type TestifylintSettings struct {
 		ExpVarPattern string `mapstructure:"pattern"`
 	} `mapstructure:"expected-actual"`
 
+	Formatter struct {
+		CheckFormatString *bool `mapstructure:"check-format-string"`
+		RequireFFuncs     bool  `mapstructure:"require-f-funcs"`
+	} `mapstructure:"formatter"`
+
 	GoRequire struct {
 		IgnoreHTTPHandlers bool `mapstructure:"ignore-http-handlers"`
 	} `mapstructure:"go-require"`

pkg/config/linters_settings.go

@@ -31,3 +31,44 @@ func example() {
 func wrapContext(ctx context.Context) context.Context {
 	return context.WithoutCancel(ctx)
 }
+
+// storing contexts in a struct isn't recommended, but local copies of a non-pointer struct should act like local copies of a context.
+func inStructs(ctx context.Context) {
+	for i := 0; i < 10; i++ {
+		c := struct{ Ctx context.Context }{ctx}
+		c.Ctx = context.WithValue(c.Ctx, "key", i)
+		c.Ctx = context.WithValue(c.Ctx, "other", "val")
+	}
+
+	for i := 0; i < 10; i++ {
+		c := []struct{ Ctx context.Context }{{ctx}}
+		c[0].Ctx = context.WithValue(c[0].Ctx, "key", i)
+		c[0].Ctx = context.WithValue(c[0].Ctx, "other", "val")
+	}
+
+	c := struct{ Ctx context.Context }{ctx}
+	for i := 0; i < 10; i++ {
+		c := c
+		c.Ctx = context.WithValue(c.Ctx, "key", i)
+		c.Ctx = context.WithValue(c.Ctx, "other", "val")
+	}
+
+	pc := &struct{ Ctx context.Context }{ctx}
+	for i := 0; i < 10; i++ {
+		c := pc
+		c.Ctx = context.WithValue(c.Ctx, "key", i) // want "nested context in loop"
+		c.Ctx = context.WithValue(c.Ctx, "other", "val")
+	}
+
+	r := []struct{ Ctx context.Context }{{ctx}}
+	for i := 0; i < 10; i++ {
+		r[0].Ctx = context.WithValue(r[0].Ctx, "key", i) // want "nested context in loop"
+		r[0].Ctx = context.WithValue(r[0].Ctx, "other", "val")
+	}
+
+	rp := []*struct{ Ctx context.Context }{{ctx}}
+	for i := 0; i < 10; i++ {
+		rp[0].Ctx = context.WithValue(rp[0].Ctx, "key", i) // want "nested context in loop"
+		rp[0].Ctx = context.WithValue(rp[0].Ctx, "other", "val")
+	}
+}

pkg/golinters/fatcontext/testdata/fatcontext.go

@@ -121,7 +121,7 @@ func getLLLIssuesForFile(filename string, maxLineLen int, tabSpaces string) ([]r
 					Filename: filename,
 					Line:     lineNumber,
 				},
-				Text:       fmt.Sprintf("line is %d characters", lineLen),
+				Text:       fmt.Sprintf("the line is %d characters long, which exceeds the maximum of %d characters.", lineLen, maxLineLen),
 				FromLinter: linterName,
 			})
 		}