Merge remote-tracking branch 'origin/embeddedcheck-linter' into embeddedcheck-linter

manuelarte · manuelarte · commit ad2d1357c00f · 2025-05-11T20:51:45.000+02:00
# Conflicts:
#	go.mod
#	go.sum
diff --git a/.golangci.next.reference.yml b/.golangci.next.reference.yml
@@ -541,6 +541,9 @@ linters:
       # Checks if the exported methods of a structure are placed before the non-exported ones.
       # Default: true
       struct-method: false
+      # Checks if the constructors and/or structure methods are sorted alphabetically.
+      # Default: false
+      alphabetical: true
 
     funlen:
       # Checks the number of lines in a function.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,36 @@ 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.1.6
+
+1. Linters bug fixes
+   * `godot`: from 1.5.0 to 1.5.1
+   * `musttag`: from 0.13.0 to 0.13.1
+2. Documentation
+   * Add note about golangci-lint v2 integration in VS Code
+
+### v2.1.5
+
+Due to an error related to Snapcraft, some artifacts of the v2.1.4 release have not been published.
+
+This release contains the same things as v2.1.3.
+
+### v2.1.4
+
+Due to an error related to Snapcraft, some artifacts of the v2.1.3 release have not been published.
+
+This release contains the same things as v2.1.3.
+
+### v2.1.3
+
+1. Linters bug fixes
+   * `fatcontext`: from 0.7.2 to 0.8.0
+2. Misc.
+   * migration: fix `nakedret.max-func-lines: 0`
+   * migration: fix order of `staticcheck` settings
+   * fix: add `go.mod` hash to the cache salt
+   * fix: use diagnostic position for related information position
+
 ### v2.1.2
 
 1. Linters bug fixes
diff --git a/assets/github-action-config-v2.json b/assets/github-action-config-v2.json
diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/docs/src/docs/welcome/integrations.mdx b/docs/src/docs/welcome/integrations.mdx
@@ -15,6 +15,8 @@ Both v1 and v2 versions are supported.
 
 Install the [extension](https://marketplace.visualstudio.com/items?itemName=golang.Go).
 
+**Note:** To use golangci-lint v2, you may need to switch to the pre-release version of the extension: [vscode-go#3732](https://github.com/golang/vscode-go/issues/3732#issuecomment-2805974456).
+
 <details>
 <summary style={{color: '#737380'}}>Recommended settings for those who installed golangci-lint manually</summary>
 
diff --git a/go.mod b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24
 	github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.1
 	github.com/OpenPeeDeeP/depguard/v2 v2.2.1
-	github.com/alecthomas/chroma/v2 v2.16.0
+	github.com/alecthomas/chroma/v2 v2.17.2
 	github.com/alecthomas/go-check-sumtype v0.3.1
 	github.com/alexkohler/nakedret/v2 v2.0.6
 	github.com/alexkohler/prealloc v1.0.0
@@ -74,7 +74,7 @@ require (
 	github.com/leonklingele/grouper v1.1.2
 	github.com/macabu/inamedparam v0.2.0
 	github.com/manuelarte/embeddedcheck v0.1.0
-	github.com/manuelarte/funcorder v0.2.1
+	github.com/manuelarte/funcorder v0.3.0
 	github.com/maratori/testableexamples v1.0.0
 	github.com/maratori/testpackage v1.1.1
 	github.com/matoous/godox v1.1.0
@@ -98,7 +98,7 @@ require (
 	github.com/sashamelentyev/interfacebloat v1.1.0
 	github.com/sashamelentyev/usestdlibvars v1.28.0
 	github.com/securego/gosec/v2 v2.22.3
-	github.com/shirou/gopsutil/v4 v4.25.3
+	github.com/shirou/gopsutil/v4 v4.25.4
 	github.com/sirupsen/logrus v1.9.3
 	github.com/sivchari/containedctx v1.0.3
 	github.com/sonatard/noctx v0.1.0
@@ -110,7 +110,7 @@ require (
 	github.com/stbenjam/no-sprintf-host-port v0.2.0
 	github.com/stretchr/testify v1.10.0
 	github.com/tdakkota/asciicheck v0.4.1
-	github.com/tetafro/godot v1.5.0
+	github.com/tetafro/godot v1.5.1
 	github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67
 	github.com/timonwong/loggercheck v0.11.0
 	github.com/tomarrell/wrapcheck/v2 v2.11.0
@@ -125,7 +125,7 @@ require (
 	github.com/yeya24/promlinter v0.3.0
 	github.com/ykadowak/zerologlint v0.1.5
 	gitlab.com/bosi/decorder v0.4.2
-	go-simpler.org/musttag v0.13.0
+	go-simpler.org/musttag v0.13.1
 	go-simpler.org/sloglint v0.11.0
 	go.augendre.info/fatcontext v0.8.0
 	go.uber.org/automaxprocs v1.6.0
diff --git a/go.sum b/go.sum
diff --git a/jsonschema/golangci.next.jsonschema.json b/jsonschema/golangci.next.jsonschema.json
@@ -1317,6 +1317,11 @@
               "description": "Checks if the exported methods of a structure are placed before the non-exported ones.",
               "type": "boolean",
               "default": true
+            },
+            "alphabetical": {
+              "description": "Checks if the constructors and/or structure methods are sorted alphabetically.",
+              "type": "boolean",
+              "default": false
             }
           }
         },
diff --git a/pkg/config/linters_settings.go b/pkg/config/linters_settings.go
@@ -428,6 +428,7 @@ type ForbidigoPattern struct {
 type FuncOrderSettings struct {
 	Constructor  bool `mapstructure:"constructor,omitempty"`
 	StructMethod bool `mapstructure:"struct-method,omitempty"`
+	Alphabetical bool `mapstructure:"alphabetical,omitempty"`
 }
 
 type FunlenSettings struct {
diff --git a/pkg/golinters/funcorder/funcorder.go b/pkg/golinters/funcorder/funcorder.go
@@ -17,6 +17,7 @@ func New(settings *config.FuncOrderSettings) *goanalysis.Linter {
 		cfg[a.Name] = map[string]any{
 			analyzer.ConstructorCheckName:  settings.Constructor,
 			analyzer.StructMethodCheckName: settings.StructMethod,
+			analyzer.AlphabeticalCheckName: settings.Alphabetical,
 		}
 	}
 
diff --git a/pkg/golinters/ginkgolinter/testdata/go.mod b/pkg/golinters/ginkgolinter/testdata/go.mod
@@ -3,18 +3,19 @@ module ginkgolinter
 go 1.23.0
 
 require (
-	github.com/onsi/ginkgo/v2 v2.23.3
+	github.com/onsi/ginkgo/v2 v2.23.4
 	github.com/onsi/gomega v1.37.0
 )
 
 require (
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
+	github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
+	go.uber.org/automaxprocs v1.6.0 // indirect
 	golang.org/x/net v0.37.0 // indirect
-	golang.org/x/sys v0.31.0 // indirect
+	golang.org/x/sys v0.32.0 // indirect
 	golang.org/x/text v0.23.0 // indirect
-	golang.org/x/tools v0.30.0 // indirect
+	golang.org/x/tools v0.31.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/pkg/golinters/ginkgolinter/testdata/go.sum b/pkg/golinters/ginkgolinter/testdata/go.sum
diff --git a/pkg/golinters/godot/testdata/fix/in/godot.go b/pkg/golinters/godot/testdata/fix/in/godot.go
@@ -11,3 +11,10 @@ func godot(a, b int) int {
 	// Nothing to do here
 	return a + b
 }
+
+// Foo Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+// Aenean rhoncus odio enim, et pulvinar libero ultrices quis.
+// Nulla at erat tellus. Maecenas id dapibus velit, ut porttitor ipsum
+func Foo() {
+	// nothing to do here
+}
diff --git a/pkg/golinters/godot/testdata/fix/out/godot.go b/pkg/golinters/godot/testdata/fix/out/godot.go
@@ -11,3 +11,10 @@ func godot(a, b int) int {
 	// Nothing to do here
 	return a + b
 }
+
+// Foo Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+// Aenean rhoncus odio enim, et pulvinar libero ultrices quis.
+// Nulla at erat tellus. Maecenas id dapibus velit, ut porttitor ipsum.
+func Foo() {
+	// nothing to do here
+}
diff --git a/pkg/golinters/godot/testdata/godot.go b/pkg/golinters/godot/testdata/godot.go
@@ -7,3 +7,12 @@ package testdata
 func Godot() {
 	// nothing to do here
 }
+
+// want +4 "Comment should end in a period"
+
+// Foo Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+// Aenean rhoncus odio enim, et pulvinar libero ultrices quis.
+// Nulla at erat tellus. Maecenas id dapibus velit, ut porttitor ipsum
+func Foo() {
+	// nothing to do here
+}
diff --git a/pkg/golinters/protogetter/testdata/go.mod b/pkg/golinters/protogetter/testdata/go.mod
@@ -3,13 +3,13 @@ module protogetter
 go 1.23.0
 
 require (
-	google.golang.org/grpc v1.71.1
+	google.golang.org/grpc v1.72.0
 	google.golang.org/protobuf v1.36.6
 )
 
 require (
 	golang.org/x/net v0.38.0 // indirect
 	golang.org/x/sys v0.31.0 // indirect
 	golang.org/x/text v0.23.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
 )
diff --git a/pkg/golinters/protogetter/testdata/go.sum b/pkg/golinters/protogetter/testdata/go.sum

Original file line number	Diff line number	Diff line change
`@@ -1317,6 +1317,11 @@`
`1317`	`1317`	`"description": "Checks if the exported methods of a structure are placed before the non-exported ones.",`
`1318`	`1318`	`"type": "boolean",`
`1319`	`1319`	`"default": true`
	`1320`	`+ },`
	`1321`	`+ "alphabetical": {`
	`1322`	`+ "description": "Checks if the constructors and/or structure methods are sorted alphabetically.",`
	`1323`	`+ "type": "boolean",`
	`1324`	`+ "default": false`
`1320`	`1325`	`}`
`1321`	`1326`	`}`
`1322`	`1327`	`},`
Original file line number	Diff line number	Diff line change
`@@ -428,6 +428,7 @@ type ForbidigoPattern struct {`
`428`	`428`	`type FuncOrderSettings struct {`
`429`	`429`	Constructor bool `mapstructure:"constructor,omitempty"`
`430`	`430`	StructMethod bool `mapstructure:"struct-method,omitempty"`
	`431`	+ Alphabetical bool `mapstructure:"alphabetical,omitempty"`
`431`	`432`	`}`
`432`	`433`
`433`	`434`	`type FunlenSettings struct {`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ func New(settings config.FuncOrderSettings) goanalysis.Linter {`
`17`	`17`	`cfg[a.Name] = map[string]any{`
`18`	`18`	`analyzer.ConstructorCheckName: settings.Constructor,`
`19`	`19`	`analyzer.StructMethodCheckName: settings.StructMethod,`
	`20`	`+ analyzer.AlphabeticalCheckName: settings.Alphabetical,`
`20`	`21`	`}`
`21`	`22`	`}`
`22`	`23`