aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/github.com/daixiang0
diff options
context:
space:
mode:
authordependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>2023-08-10 01:40:38 +0000
committerAleksandr Nogikh <nogikh@google.com>2023-08-10 08:15:09 +0000
commitc7f6fc5b21cf154fabe12125d2cd1b274c57cb53 (patch)
treece1c303a28a94d0096debb33d8bf853872ed1577 /vendor/github.com/daixiang0
parent4df3089c378ffe870e094cb3088bcad17d16d02d (diff)
mod: do: bump github.com/golangci/golangci-lint from 1.53.3 to 1.54.0
Bumps [github.com/golangci/golangci-lint](https://github.com/golangci/golangci-lint) from 1.53.3 to 1.54.0. - [Release notes](https://github.com/golangci/golangci-lint/releases) - [Changelog](https://github.com/golangci/golangci-lint/blob/master/CHANGELOG.md) - [Commits](https://github.com/golangci/golangci-lint/compare/v1.53.3...v1.54.0) --- updated-dependencies: - dependency-name: github.com/golangci/golangci-lint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Diffstat (limited to 'vendor/github.com/daixiang0')
-rw-r--r--vendor/github.com/daixiang0/gci/pkg/config/config.go1
-rw-r--r--vendor/github.com/daixiang0/gci/pkg/gci/gci.go14
-rw-r--r--vendor/github.com/daixiang0/gci/pkg/io/file.go9
-rw-r--r--vendor/github.com/daixiang0/gci/pkg/io/search.go38
-rw-r--r--vendor/github.com/daixiang0/gci/pkg/section/standard_list.go8
5 files changed, 61 insertions, 9 deletions
diff --git a/vendor/github.com/daixiang0/gci/pkg/config/config.go b/vendor/github.com/daixiang0/gci/pkg/config/config.go
index b32148b18..120e787e9 100644
--- a/vendor/github.com/daixiang0/gci/pkg/config/config.go
+++ b/vendor/github.com/daixiang0/gci/pkg/config/config.go
@@ -23,6 +23,7 @@ type BoolConfig struct {
NoPrefixComments bool `yaml:"no-prefixComments"`
Debug bool `yaml:"-"`
SkipGenerated bool `yaml:"skipGenerated"`
+ SkipVendor bool `yaml:"skipVendor"`
CustomOrder bool `yaml:"customOrder"`
}
diff --git a/vendor/github.com/daixiang0/gci/pkg/gci/gci.go b/vendor/github.com/daixiang0/gci/pkg/gci/gci.go
index 0fd7a0ec6..e84a16676 100644
--- a/vendor/github.com/daixiang0/gci/pkg/gci/gci.go
+++ b/vendor/github.com/daixiang0/gci/pkg/gci/gci.go
@@ -49,6 +49,16 @@ func WriteFormattedFiles(paths []string, cfg config.Config) error {
})
}
+func ListUnFormattedFiles(paths []string, cfg config.Config) error {
+ return processGoFilesInPaths(paths, cfg, func(filePath string, unmodifiedFile, formattedFile []byte) error {
+ if bytes.Equal(unmodifiedFile, formattedFile) {
+ return nil
+ }
+ fmt.Println(filePath)
+ return nil
+ })
+}
+
func DiffFormattedFiles(paths []string, cfg config.Config) error {
return processStdInAndGoFilesInPaths(paths, cfg, func(filePath string, unmodifiedFile, formattedFile []byte) error {
fileURI := span.URIFromPath(filePath)
@@ -76,11 +86,11 @@ func DiffFormattedFilesToArray(paths []string, cfg config.Config, diffs *[]strin
type fileFormattingFunc func(filePath string, unmodifiedFile, formattedFile []byte) error
func processStdInAndGoFilesInPaths(paths []string, cfg config.Config, fileFunc fileFormattingFunc) error {
- return ProcessFiles(io.StdInGenerator.Combine(io.GoFilesInPathsGenerator(paths)), cfg, fileFunc)
+ return ProcessFiles(io.StdInGenerator.Combine(io.GoFilesInPathsGenerator(paths, cfg.SkipVendor)), cfg, fileFunc)
}
func processGoFilesInPaths(paths []string, cfg config.Config, fileFunc fileFormattingFunc) error {
- return ProcessFiles(io.GoFilesInPathsGenerator(paths), cfg, fileFunc)
+ return ProcessFiles(io.GoFilesInPathsGenerator(paths, cfg.SkipVendor), cfg, fileFunc)
}
func ProcessFiles(fileGenerator io.FileGeneratorFunc, cfg config.Config, fileFunc fileFormattingFunc) error {
diff --git a/vendor/github.com/daixiang0/gci/pkg/io/file.go b/vendor/github.com/daixiang0/gci/pkg/io/file.go
index f92d16e14..79950792c 100644
--- a/vendor/github.com/daixiang0/gci/pkg/io/file.go
+++ b/vendor/github.com/daixiang0/gci/pkg/io/file.go
@@ -39,8 +39,13 @@ func (a FileGeneratorFunc) Combine(b FileGeneratorFunc) FileGeneratorFunc {
}
}
-func GoFilesInPathsGenerator(paths []string) FileGeneratorFunc {
- return FilesInPathsGenerator(paths, isGoFile)
+func GoFilesInPathsGenerator(paths []string, skipVendor bool) FileGeneratorFunc {
+ checkFunc := isGoFile
+ if skipVendor {
+ checkFunc = checkChains(isGoFile, isOutsideVendorDir)
+ }
+
+ return FilesInPathsGenerator(paths, checkFunc)
}
func FilesInPathsGenerator(paths []string, fileCheckFun fileCheckFunction) FileGeneratorFunc {
diff --git a/vendor/github.com/daixiang0/gci/pkg/io/search.go b/vendor/github.com/daixiang0/gci/pkg/io/search.go
index 04f005876..cd821582e 100644
--- a/vendor/github.com/daixiang0/gci/pkg/io/search.go
+++ b/vendor/github.com/daixiang0/gci/pkg/io/search.go
@@ -6,7 +6,7 @@ import (
"path/filepath"
)
-type fileCheckFunction func(file os.FileInfo) bool
+type fileCheckFunction func(path string, file os.FileInfo) bool
func FindFilesForPath(path string, fileCheckFun fileCheckFunction) ([]string, error) {
switch entry, err := os.Stat(path); {
@@ -14,7 +14,7 @@ func FindFilesForPath(path string, fileCheckFun fileCheckFunction) ([]string, er
return nil, err
case entry.IsDir():
return findFilesForDirectory(path, fileCheckFun)
- case fileCheckFun(entry):
+ case fileCheckFun(path, entry):
return []string{filepath.Clean(path)}, nil
default:
return []string{}, nil
@@ -31,7 +31,7 @@ func findFilesForDirectory(dirPath string, fileCheckFun fileCheckFunction) ([]st
if err != nil {
return err
}
- if !entry.IsDir() && fileCheckFun(file) {
+ if !entry.IsDir() && fileCheckFun(path, file) {
filePaths = append(filePaths, filepath.Clean(path))
}
return nil
@@ -42,6 +42,36 @@ func findFilesForDirectory(dirPath string, fileCheckFun fileCheckFunction) ([]st
return filePaths, nil
}
-func isGoFile(file os.FileInfo) bool {
+func isGoFile(_ string, file os.FileInfo) bool {
return !file.IsDir() && filepath.Ext(file.Name()) == ".go"
}
+
+func isOutsideVendorDir(path string, _ os.FileInfo) bool {
+ for {
+ base := filepath.Base(path)
+ if base == "vendor" {
+ return false
+ }
+
+ prevPath := path
+ path = filepath.Dir(path)
+
+ if prevPath == path {
+ break
+ }
+ }
+
+ return true
+}
+
+func checkChains(funcs ...fileCheckFunction) fileCheckFunction {
+ return func(path string, file os.FileInfo) bool {
+ for _, checkFunc := range funcs {
+ if !checkFunc(path, file) {
+ return false
+ }
+ }
+
+ return true
+ }
+}
diff --git a/vendor/github.com/daixiang0/gci/pkg/section/standard_list.go b/vendor/github.com/daixiang0/gci/pkg/section/standard_list.go
index f0e904d4d..05e799939 100644
--- a/vendor/github.com/daixiang0/gci/pkg/section/standard_list.go
+++ b/vendor/github.com/daixiang0/gci/pkg/section/standard_list.go
@@ -1,12 +1,14 @@
package section
-// Code generated based on go1.20.1. DO NOT EDIT.
+// Code generated based on go1.21.0 X:arenas. DO NOT EDIT.
var standardPackages = map[string]struct{}{
"archive/tar": {},
"archive/zip": {},
+ "arena": {},
"bufio": {},
"bytes": {},
+ "cmp": {},
"compress/bzip2": {},
"compress/flate": {},
"compress/gzip": {},
@@ -96,7 +98,9 @@ var standardPackages = map[string]struct{}{
"io/fs": {},
"io/ioutil": {},
"log": {},
+ "log/slog": {},
"log/syslog": {},
+ "maps": {},
"math": {},
"math/big": {},
"math/bits": {},
@@ -139,6 +143,7 @@ var standardPackages = map[string]struct{}{
"runtime/pprof": {},
"runtime/race": {},
"runtime/trace": {},
+ "slices": {},
"sort": {},
"strconv": {},
"strings": {},
@@ -149,6 +154,7 @@ var standardPackages = map[string]struct{}{
"testing/fstest": {},
"testing/iotest": {},
"testing/quick": {},
+ "testing/slogtest": {},
"text/scanner": {},
"text/tabwriter": {},
"text/template": {},