Skip to content

Commit 588df60

Browse files
committed
review: simplify
1 parent e190980 commit 588df60

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

pkg/golinters/importas/importas.go

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,12 @@ func New(settings *config.ImportAsSettings) *goanalysis.Linter {
5151
uniqPackages[a.Pkg] = a
5252
}
5353

54-
// Ignore duplication for empty aliases.
55-
if a.Alias != "" {
56-
// skip the duplication check when the alias is a regular expression replacement pattern (ie. contains `$`).
57-
v, ok := uniqAliases[a.Alias]
58-
if ok && !strings.Contains(a.Alias, "$") {
59-
lintCtx.Log.Errorf("invalid configuration, multiple packages with the same alias: alias=%s packages=[%s,%s]", a.Alias, a.Pkg, v.Pkg)
60-
} else {
61-
uniqAliases[a.Alias] = a
62-
}
54+
// skip the duplication check when the alias is a regular expression replacement pattern (ie. contains `$`).
55+
v, ok := uniqAliases[a.Alias]
56+
if ok && !strings.Contains(a.Alias, "$") {
57+
lintCtx.Log.Errorf("invalid configuration, multiple packages with the same alias: alias=%s packages=[%s,%s]", a.Alias, a.Pkg, v.Pkg)
58+
} else if a.Alias != "" { // Ignore duplication for empty aliases.
59+
uniqAliases[a.Alias] = a
6360
}
6461

6562
err := analyzer.Flags.Set("alias", fmt.Sprintf("%s:%s", a.Pkg, a.Alias))

0 commit comments

Comments
 (0)