Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1d5598a

Browse files
committed
Add 'floatcompare' linter
1 parent13c4726 commit1d5598a

File tree

7 files changed

+126
-3
lines changed

7 files changed

+126
-3
lines changed

‎.golangci.example.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,11 @@ linters-settings:
285285
-'*.Test'
286286
-'example.com/package.ExampleStruct'
287287

288+
floatcompare:
289+
# Search only for == and != no other comparisons
290+
# Default: false
291+
equal-only:true
292+
288293
forbidigo:
289294
# Forbid the following identifiers (list of regexp).
290295
forbid:
@@ -1636,6 +1641,7 @@ linters:
16361641
-exhaustive
16371642
-exhaustivestruct
16381643
-exportloopref
1644+
-floatcompare
16391645
-forbidigo
16401646
-forcetypeassert
16411647
-funlen
@@ -1726,6 +1732,7 @@ linters:
17261732
-exhaustive
17271733
-exhaustivestruct
17281734
-exportloopref
1735+
-floatcompare
17291736
-forbidigo
17301737
-forcetypeassert
17311738
-funlen

‎go.mod‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ require (
6161
github.com/mitchellh/go-homedirv1.1.0
6262
github.com/mitchellh/go-psv1.0.0
6363
github.com/moricho/tparallelv0.2.1
64+
github.com/mweb/floatcomparev1.0.4
6465
github.com/nakabonne/nestifv0.3.1
6566
github.com/nishanths/exhaustivev0.7.11
6667
github.com/nishanths/predeclaredv0.2.1
@@ -162,7 +163,7 @@ require (
162163
golang.org/x/exp/typeparamsv0.0.0-20220218215828-6cf2b201936e// indirect
163164
golang.org/x/modv0.6.0-dev.0.20220106191415-9b9b3d81d5e3// indirect
164165
golang.org/x/syncv0.0.0-20210220032951-036812b2e83c// indirect
165-
golang.org/x/sysv0.0.0-20220319134239-a9b59b0215f8// indirect
166+
golang.org/x/sysv0.0.0-20220405052023-b1e9470b6e64// indirect
166167
golang.org/x/textv0.3.7// indirect
167168
golang.org/x/xerrorsv0.0.0-20200804184101-5ec99f83aff1// indirect
168169
google.golang.org/protobufv1.27.1// indirect

‎go.sum‎

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎pkg/config/linters_settings.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ type LintersSettings struct {
123123
ErrorLintErrorLintSettings
124124
ExhaustiveExhaustiveSettings
125125
ExhaustiveStructExhaustiveStructSettings
126+
FloatCompareFloatCompareSettings
126127
ForbidigoForbidigoSettings
127128
FunlenFunlenSettings
128129
GciGciSettings
@@ -255,6 +256,10 @@ type ExhaustiveStructSettings struct {
255256
StructPatterns []string`mapstructure:"struct-patterns"`
256257
}
257258

259+
typeFloatCompareSettingsstruct {
260+
EqualOnlybool`mapstructure:"equal-only"`
261+
}
262+
258263
typeForbidigoSettingsstruct {
259264
Forbid []string`mapstructure:"forbid"`
260265
ExcludeGodocExamplesbool`mapstructure:"exclude-godoc-examples"`

‎pkg/golinters/floatcompare.go‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package golinters
2+
3+
import (
4+
"github.com/mweb/floatcompare"
5+
"golang.org/x/tools/go/analysis"
6+
7+
"github.com/golangci/golangci-lint/pkg/config"
8+
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
9+
)
10+
11+
funcNewFloatCompare(settings*config.FloatCompareSettings)*goanalysis.Linter {
12+
a:=floatcompare.NewAnalyzer()
13+
14+
varcfgmap[string]map[string]interface{}
15+
ifsettings!=nil {
16+
d:=map[string]interface{}{
17+
"equalOnly":settings.EqualOnly,
18+
}
19+
20+
cfg=map[string]map[string]interface{}{a.Name:d}
21+
}
22+
23+
returngoanalysis.NewLinter(
24+
a.Name,
25+
a.Doc,
26+
[]*analysis.Analyzer{a},
27+
cfg,
28+
).WithLoadMode(goanalysis.LoadModeTypesInfo)
29+
}

‎pkg/lint/lintersdb/manager.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config {
107107
varerrorlintCfg*config.ErrorLintSettings
108108
varexhaustiveCfg*config.ExhaustiveSettings
109109
varexhaustiveStructCfg*config.ExhaustiveStructSettings
110+
varfloatCompareStructCfg*config.FloatCompareSettings
110111
vargciCfg*config.GciSettings
111112
vargoModDirectivesCfg*config.GoModDirectivesSettings
112113
vargoMndCfg*config.GoMndSettings
@@ -140,6 +141,7 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config {
140141
errorlintCfg=&m.cfg.LintersSettings.ErrorLint
141142
exhaustiveCfg=&m.cfg.LintersSettings.Exhaustive
142143
exhaustiveStructCfg=&m.cfg.LintersSettings.ExhaustiveStruct
144+
floatCompareStructCfg=&m.cfg.LintersSettings.FloatCompare
143145
gciCfg=&m.cfg.LintersSettings.Gci
144146
goModDirectivesCfg=&m.cfg.LintersSettings.GoModDirectives
145147
goMndCfg=&m.cfg.LintersSettings.Gomnd
@@ -289,6 +291,12 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config {
289291
WithLoadForGoAnalysis().
290292
WithURL("https://github.com/kyoh86/exportloopref"),
291293

294+
linter.NewConfig(golinters.NewFloatCompare(floatCompareStructCfg)).
295+
WithSince("v1.46.0").
296+
WithPresets(linter.PresetBugs).
297+
WithLoadForGoAnalysis().
298+
WithURL("https://github.com/mweb/floatcompare"),
299+
292300
linter.NewConfig(golinters.NewForbidigo()).
293301
WithSince("v1.34.0").
294302
WithPresets(linter.PresetStyle).

‎test/testdata/floatcompare.go‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
// args: -Efloatcompare
2+
package testdata
3+
4+
import"fmt"
5+
6+
funcEqualCompareIfFloats() {
7+
x,y:=400.,500.
8+
if300.==100. {// ERROR `float comparison found "300. == 100."`
9+
dummy()
10+
}
11+
ifx==y {// ERROR `float comparison found "x == y"`
12+
dummy()
13+
}
14+
if300.+200.==10. {// ERROR `float comparison found "300.+200. == 10."`
15+
dummy()
16+
}
17+
if300==200 {
18+
dummy()
19+
}
20+
}
21+
22+
funcNotEqualCompareIfFloats() {
23+
x,y:=400.,500.
24+
if300.!=100. {// ERROR `float comparison found "300. != 100."`
25+
26+
dummy()
27+
}
28+
ifx!=y {// ERROR `float comparison found "x != y"`
29+
dummy()
30+
}
31+
}
32+
33+
funcEqualCompareIfCustomType() {
34+
typenumberfloat64
35+
varx,ynumber=300.,400.
36+
ifx==y {// ERROR `float comparison found "x == y"`
37+
dummy()
38+
}
39+
}
40+
41+
funcGreaterLessCompareIfFloats() {
42+
if300.>=100. {// ERROR `float comparison found "300. >= 100."`
43+
dummy()
44+
}
45+
if300.<=100. {// ERROR `float comparison found "300. <= 100."`
46+
dummy()
47+
}
48+
if300.<100. {// ERROR `float comparison found "300. < 100."`
49+
dummy()
50+
}
51+
if300.>100. {// ERROR `float comparison found "300. > 100."`
52+
dummy()
53+
}
54+
}
55+
56+
funcSwitchStmtWithFloat() {
57+
switch300. {// ERROR "float comparison with switch statement"
58+
case100.:
59+
case200:
60+
}
61+
}
62+
63+
funcEqualCompareSwitchFloats() {
64+
switch {
65+
case100.==200.:// ERROR `float comparison found "100. == 200."`
66+
}
67+
}
68+
69+
funcdummy() {
70+
fmt.Println("dummy()")
71+
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp