Skip to content

Commit 326da7d

Browse files
committed
tools: switch to use incu6us/goimports-reviser and update to latest
Signed-off-by: Koichi Shiraishi <[email protected]>
1 parent 21fbdd7 commit 326da7d

File tree

4 files changed

+232
-206
lines changed

4 files changed

+232
-206
lines changed

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,10 @@ coverage: tools/bin/gotestsum ## Takes packages test coverage.
6464
##@ fmt, lint
6565

6666
.PHONY: fmt
67-
fmt: tools/goimportz tools/gofumpt ## Run goimportz and gofumpt.
67+
fmt: tools/goimports-reviser tools/gofumpt ## Run goimports-reviser and gofumpt.
6868
$(call target)
69-
find . -iname "*.go" -not -path "./vendor/**" | xargs -P ${JOBS} ${TOOLS_BIN}/goimportz -local=${PKG},$(subst /protocol,,$(PKG)) -w
69+
@${TOOLS_BIN}/goimports-reviser -use-cache -project-name ${PKG} -company-prefixes $(dir ${PKG}) -set-alias -excludes "vendor/*,tools/*,_*,**/.*" ./...
70+
${TOOLS_BIN}/gofumpt -extra -w .
7071
find . -iname "*.go" -not -path "./vendor/**" | xargs -P ${JOBS} ${TOOLS_BIN}/gofumpt -extra -w
7172

7273
.PHONY: lint
@@ -89,7 +90,7 @@ tools/%: ## install an individual dependent tool
8990
tools/bin/%: ${TOOLS_DIR}/go.mod ${TOOLS_DIR}/go.sum
9091
@cd tools; \
9192
for t in ${TOOLS}; do \
92-
if [ -z '$*' ] || [ $$(basename $$t) = '$*' ]; then \
93+
if [ -z '$*' ] || [ $$(basename $${t%%/v[0-9]*}) = '$*' ]; then \
9394
echo "Install $$t ..." >&2; \
9495
GOBIN=${TOOLS_BIN} CGO_ENABLED=0 go install -mod=mod ${GO_FLAGS} "$${t}"; \
9596
fi \

tools/go.mod

Lines changed: 64 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
module go.lsp.dev/protocol/tools
22

3-
go 1.22.2
3+
go 1.23
44

55
require (
6-
github.com/golangci/golangci-lint v1.57.2
7-
github.com/zchee/goimportz v1.1.0
8-
gotest.tools/gotestsum v1.11.0
9-
mvdan.cc/gofumpt v0.6.0
6+
github.com/golangci/golangci-lint v1.61.0
7+
github.com/incu6us/goimports-reviser/v3 v3.6.5
8+
gotest.tools/gotestsum v1.12.0
9+
mvdan.cc/gofumpt v0.7.0
1010
)
1111

1212
require (
1313
4d63.com/gocheckcompilerdirectives v1.2.1 // indirect
1414
4d63.com/gochecknoglobals v0.2.1 // indirect
15-
github.com/4meepo/tagalign v1.3.3 // indirect
16-
github.com/Abirdcfly/dupword v0.0.14 // indirect
17-
github.com/Antonboom/errname v0.1.12 // indirect
18-
github.com/Antonboom/nilnil v0.1.7 // indirect
19-
github.com/Antonboom/testifylint v1.2.0 // indirect
20-
github.com/BurntSushi/toml v1.3.2 // indirect
15+
github.com/4meepo/tagalign v1.3.4 // indirect
16+
github.com/Abirdcfly/dupword v0.1.1 // indirect
17+
github.com/Antonboom/errname v0.1.13 // indirect
18+
github.com/Antonboom/nilnil v0.1.9 // indirect
19+
github.com/Antonboom/testifylint v1.4.3 // indirect
20+
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
21+
github.com/Crocmagnon/fatcontext v0.5.2 // indirect
2122
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
22-
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.2.0 // indirect
23-
github.com/Masterminds/semver v1.5.0 // indirect
23+
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0 // indirect
24+
github.com/Masterminds/semver/v3 v3.3.0 // indirect
2425
github.com/OpenPeeDeeP/depguard/v2 v2.2.0 // indirect
2526
github.com/alecthomas/go-check-sumtype v0.1.4 // indirect
2627
github.com/alexkohler/nakedret/v2 v2.0.4 // indirect
@@ -29,50 +30,51 @@ require (
2930
github.com/ashanbrown/forbidigo v1.6.0 // indirect
3031
github.com/ashanbrown/makezero v1.1.1 // indirect
3132
github.com/beorn7/perks v1.0.1 // indirect
32-
github.com/bitfield/gotestdox v0.2.1 // indirect
33+
github.com/bitfield/gotestdox v0.2.2 // indirect
3334
github.com/bkielbasa/cyclop v1.2.1 // indirect
3435
github.com/blizzy78/varnamelen v0.8.0 // indirect
35-
github.com/bombsimon/wsl/v4 v4.2.1 // indirect
36+
github.com/bombsimon/wsl/v4 v4.4.1 // indirect
3637
github.com/breml/bidichk v0.2.7 // indirect
3738
github.com/breml/errchkjson v0.3.6 // indirect
3839
github.com/butuzov/ireturn v0.3.0 // indirect
39-
github.com/butuzov/mirror v1.1.0 // indirect
40+
github.com/butuzov/mirror v1.2.0 // indirect
4041
github.com/catenacyber/perfsprint v0.7.1 // indirect
4142
github.com/ccojocar/zxcvbn-go v1.0.2 // indirect
4243
github.com/cespare/xxhash/v2 v2.1.2 // indirect
4344
github.com/charithe/durationcheck v0.0.10 // indirect
4445
github.com/chavacava/garif v0.1.0 // indirect
45-
github.com/ckaznocha/intrange v0.1.1 // indirect
46+
github.com/ckaznocha/intrange v0.2.0 // indirect
4647
github.com/curioswitch/go-reassign v0.2.0 // indirect
47-
github.com/daixiang0/gci v0.12.3 // indirect
48+
github.com/daixiang0/gci v0.13.5 // indirect
4849
github.com/davecgh/go-spew v1.1.1 // indirect
4950
github.com/denis-tingaikin/go-header v0.5.0 // indirect
5051
github.com/dnephin/pflag v1.0.7 // indirect
5152
github.com/ettle/strcase v0.2.0 // indirect
52-
github.com/fatih/color v1.16.0 // indirect
53+
github.com/fatih/color v1.17.0 // indirect
5354
github.com/fatih/structtag v1.2.0 // indirect
54-
github.com/firefart/nonamedreturns v1.0.4 // indirect
55-
github.com/fsnotify/fsnotify v1.5.4 // indirect
55+
github.com/firefart/nonamedreturns v1.0.5 // indirect
56+
github.com/fsnotify/fsnotify v1.7.0 // indirect
5657
github.com/fzipp/gocyclo v0.6.0 // indirect
57-
github.com/ghostiam/protogetter v0.3.5 // indirect
58-
github.com/go-critic/go-critic v0.11.2 // indirect
58+
github.com/ghostiam/protogetter v0.3.6 // indirect
59+
github.com/go-critic/go-critic v0.11.4 // indirect
5960
github.com/go-toolsmith/astcast v1.1.0 // indirect
6061
github.com/go-toolsmith/astcopy v1.1.0 // indirect
6162
github.com/go-toolsmith/astequal v1.2.0 // indirect
6263
github.com/go-toolsmith/astfmt v1.1.0 // indirect
6364
github.com/go-toolsmith/astp v1.1.0 // indirect
6465
github.com/go-toolsmith/strparse v1.1.0 // indirect
6566
github.com/go-toolsmith/typep v1.1.0 // indirect
66-
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
67+
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
6768
github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect
6869
github.com/gobwas/glob v0.2.3 // indirect
69-
github.com/gofrs/flock v0.8.1 // indirect
70+
github.com/gofrs/flock v0.12.1 // indirect
7071
github.com/golang/protobuf v1.5.3 // indirect
7172
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
72-
github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e // indirect
73-
github.com/golangci/misspell v0.4.1 // indirect
73+
github.com/golangci/gofmt v0.0.0-20240816233607-d8596aa466a9 // indirect
74+
github.com/golangci/misspell v0.6.0 // indirect
75+
github.com/golangci/modinfo v0.3.4 // indirect
7476
github.com/golangci/plugin-module-register v0.1.1 // indirect
75-
github.com/golangci/revgrep v0.5.2 // indirect
77+
github.com/golangci/revgrep v0.5.3 // indirect
7678
github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed // indirect
7779
github.com/google/go-cmp v0.6.0 // indirect
7880
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
@@ -81,24 +83,25 @@ require (
8183
github.com/gostaticanalysis/comment v1.4.2 // indirect
8284
github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect
8385
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
84-
github.com/hashicorp/go-version v1.6.0 // indirect
86+
github.com/hashicorp/go-version v1.7.0 // indirect
8587
github.com/hashicorp/hcl v1.0.0 // indirect
8688
github.com/hexops/gotextdiff v1.0.3 // indirect
8789
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8890
github.com/jgautheron/goconst v1.7.1 // indirect
8991
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
9092
github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
91-
github.com/jjti/go-spancheck v0.5.3 // indirect
93+
github.com/jjti/go-spancheck v0.6.2 // indirect
9294
github.com/julz/importas v0.1.0 // indirect
93-
github.com/karamaru-alpha/copyloopvar v1.0.10 // indirect
95+
github.com/karamaru-alpha/copyloopvar v1.1.0 // indirect
9496
github.com/kisielk/errcheck v1.7.0 // indirect
9597
github.com/kkHAIKE/contextcheck v1.1.5 // indirect
9698
github.com/kulti/thelper v0.6.3 // indirect
9799
github.com/kunwardeep/paralleltest v1.0.10 // indirect
98100
github.com/kyoh86/exportloopref v0.1.11 // indirect
101+
github.com/lasiar/canonicalheader v1.1.1 // indirect
99102
github.com/ldez/gomoddirectives v0.2.4 // indirect
100103
github.com/ldez/tagliatelle v0.5.0 // indirect
101-
github.com/leonklingele/grouper v1.1.1 // indirect
104+
github.com/leonklingele/grouper v1.1.2 // indirect
102105
github.com/lufeee/execinquery v1.2.1 // indirect
103106
github.com/macabu/inamedparam v0.1.3 // indirect
104107
github.com/magiconair/properties v1.8.6 // indirect
@@ -109,44 +112,44 @@ require (
109112
github.com/mattn/go-isatty v0.0.20 // indirect
110113
github.com/mattn/go-runewidth v0.0.9 // indirect
111114
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
112-
github.com/mgechev/revive v1.3.7 // indirect
115+
github.com/mgechev/revive v1.3.9 // indirect
113116
github.com/mitchellh/go-homedir v1.1.0 // indirect
114117
github.com/mitchellh/mapstructure v1.5.0 // indirect
115-
github.com/moricho/tparallel v0.3.1 // indirect
118+
github.com/moricho/tparallel v0.3.2 // indirect
116119
github.com/nakabonne/nestif v0.3.1 // indirect
117-
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
118120
github.com/nishanths/exhaustive v0.12.0 // indirect
119121
github.com/nishanths/predeclared v0.2.2 // indirect
120122
github.com/nunnatsa/ginkgolinter v0.16.2 // indirect
121123
github.com/olekukonko/tablewriter v0.0.5 // indirect
122124
github.com/pelletier/go-toml v1.9.5 // indirect
123-
github.com/pelletier/go-toml/v2 v2.2.0 // indirect
125+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
124126
github.com/pmezard/go-difflib v1.0.0 // indirect
125-
github.com/polyfloyd/go-errorlint v1.4.8 // indirect
127+
github.com/polyfloyd/go-errorlint v1.6.0 // indirect
126128
github.com/prometheus/client_golang v1.12.1 // indirect
127129
github.com/prometheus/client_model v0.2.0 // indirect
128130
github.com/prometheus/common v0.32.1 // indirect
129131
github.com/prometheus/procfs v0.7.3 // indirect
130-
github.com/quasilyte/go-ruleguard v0.4.2 // indirect
132+
github.com/quasilyte/go-ruleguard v0.4.3-0.20240823090925-0fe6f58b47b1 // indirect
133+
github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
131134
github.com/quasilyte/gogrep v0.5.0 // indirect
132135
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
133136
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
134-
github.com/ryancurrah/gomodguard v1.3.1 // indirect
137+
github.com/ryancurrah/gomodguard v1.3.5 // indirect
135138
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
136139
github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
137140
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
138141
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
139-
github.com/sashamelentyev/usestdlibvars v1.25.0 // indirect
140-
github.com/securego/gosec/v2 v2.19.0 // indirect
142+
github.com/sashamelentyev/usestdlibvars v1.27.0 // indirect
143+
github.com/securego/gosec/v2 v2.21.2 // indirect
141144
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
142145
github.com/sirupsen/logrus v1.9.3 // indirect
143146
github.com/sivchari/containedctx v1.0.3 // indirect
144-
github.com/sivchari/tenv v1.7.1 // indirect
147+
github.com/sivchari/tenv v1.10.0 // indirect
145148
github.com/sonatard/noctx v0.0.2 // indirect
146149
github.com/sourcegraph/go-diff v0.7.0 // indirect
147150
github.com/spf13/afero v1.11.0 // indirect
148151
github.com/spf13/cast v1.5.0 // indirect
149-
github.com/spf13/cobra v1.7.0 // indirect
152+
github.com/spf13/cobra v1.8.1 // indirect
150153
github.com/spf13/jwalterweatherman v1.1.0 // indirect
151154
github.com/spf13/pflag v1.0.5 // indirect
152155
github.com/spf13/viper v1.12.0 // indirect
@@ -155,40 +158,38 @@ require (
155158
github.com/stretchr/objx v0.5.2 // indirect
156159
github.com/stretchr/testify v1.9.0 // indirect
157160
github.com/subosito/gotenv v1.4.1 // indirect
158-
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
159161
github.com/tdakkota/asciicheck v0.2.0 // indirect
160-
github.com/tetafro/godot v1.4.16 // indirect
162+
github.com/tetafro/godot v1.4.17 // indirect
161163
github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 // indirect
162164
github.com/timonwong/loggercheck v0.9.4 // indirect
163-
github.com/tomarrell/wrapcheck/v2 v2.8.3 // indirect
165+
github.com/tomarrell/wrapcheck/v2 v2.9.0 // indirect
164166
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
165167
github.com/ultraware/funlen v0.1.0 // indirect
166-
github.com/ultraware/whitespace v0.1.0 // indirect
167-
github.com/uudashr/gocognit v1.1.2 // indirect
168+
github.com/ultraware/whitespace v0.1.1 // indirect
169+
github.com/uudashr/gocognit v1.1.3 // indirect
168170
github.com/xen0n/gosmopolitan v1.2.2 // indirect
169171
github.com/yagipy/maintidx v1.0.0 // indirect
170-
github.com/yeya24/promlinter v0.2.0 // indirect
172+
github.com/yeya24/promlinter v0.3.0 // indirect
171173
github.com/ykadowak/zerologlint v0.1.5 // indirect
172-
gitlab.com/bosi/decorder v0.4.1 // indirect
173-
go-simpler.org/musttag v0.9.0 // indirect
174-
go-simpler.org/sloglint v0.5.0 // indirect
174+
gitlab.com/bosi/decorder v0.4.2 // indirect
175+
go-simpler.org/musttag v0.12.2 // indirect
176+
go-simpler.org/sloglint v0.7.2 // indirect
175177
go.uber.org/atomic v1.7.0 // indirect
176178
go.uber.org/automaxprocs v1.5.3 // indirect
177179
go.uber.org/multierr v1.6.0 // indirect
178180
go.uber.org/zap v1.24.0 // indirect
179-
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
181+
golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e // indirect
180182
golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f // indirect
181-
golang.org/x/mod v0.16.0 // indirect
182-
golang.org/x/sync v0.6.0 // indirect
183-
golang.org/x/sys v0.18.0 // indirect
184-
golang.org/x/term v0.10.0 // indirect
185-
golang.org/x/text v0.14.0 // indirect
186-
golang.org/x/tools v0.19.0 // indirect
187-
google.golang.org/protobuf v1.33.0 // indirect
188-
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
183+
golang.org/x/mod v0.21.0 // indirect
184+
golang.org/x/sync v0.8.0 // indirect
185+
golang.org/x/sys v0.25.0 // indirect
186+
golang.org/x/term v0.18.0 // indirect
187+
golang.org/x/text v0.18.0 // indirect
188+
golang.org/x/tools v0.24.0 // indirect
189+
google.golang.org/protobuf v1.34.2 // indirect
189190
gopkg.in/ini.v1 v1.67.0 // indirect
190191
gopkg.in/yaml.v2 v2.4.0 // indirect
191192
gopkg.in/yaml.v3 v3.0.1 // indirect
192-
honnef.co/go/tools v0.4.7 // indirect
193-
mvdan.cc/unparam v0.0.0-20240104100049-c549a3470d14 // indirect
193+
honnef.co/go/tools v0.5.1 // indirect
194+
mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f // indirect
194195
)

0 commit comments

Comments
 (0)