Skip to content

Commit cd5c0d7

Browse files
committed
refactor(message/extrace): 为 Options.InfoLog 指定默认值
1 parent a45ca13 commit cd5c0d7

File tree

4 files changed

+10
-12
lines changed

4 files changed

+10
-12
lines changed

Diff for: message/extract/extract.go

+1-7
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,6 @@ func Extract(ctx context.Context, o *Options) (*message.Language, error) {
6565
return &message.Language{ID: o.Language, Messages: ex.msg}, nil
6666
}
6767

68-
func (ex *extractor) info(msg localeutil.Stringer) {
69-
if ex.infoLog != nil {
70-
ex.infoLog(msg)
71-
}
72-
}
73-
7468
func (ex *extractor) inspectDirs(ctx context.Context, dirs []string) error {
7569
wg := &sync.WaitGroup{}
7670
defer wg.Wait()
@@ -239,7 +233,7 @@ func (ex *extractor) appendMsg(expr *ast.CallExpr) {
239233
return
240234
}
241235

242-
ex.info(localeutil.Phrase("find new locale string %s at %s:%d", strconv.Quote(key), path, p.Line))
236+
ex.infoLog(localeutil.Phrase("find new locale string %s at %s:%d", strconv.Quote(key), path, p.Line))
243237
ex.msg = append(ex.msg, message.Message{Key: key, Message: message.Text{Msg: key}})
244238
}
245239

Diff for: message/extract/options.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"fmt"
99
"go/token"
1010
"io/fs"
11+
"log"
1112
"os"
1213
"path"
1314
"path/filepath"
@@ -83,7 +84,10 @@ type fn struct {
8384

8485
func (o *Options) buildExtractor() (*extractor, error) {
8586
if o.WarnLog == nil {
86-
o.WarnLog = func(v localeutil.Stringer) { fmt.Print(v) }
87+
o.WarnLog = func(v localeutil.Stringer) { log.Println(v) } // TODO(go1.21): slog
88+
}
89+
if o.InfoLog == nil {
90+
o.InfoLog = func(v localeutil.Stringer) { log.Println(v) }
8791
}
8892

8993
abs, err := filepath.Abs(o.Root)

Diff for: message/extract/testdata/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/issue9/localeutil/testdata
22

33
require github.com/issue9/localeutil v1.0.0
44

5-
require golang.org/x/text v0.14.0 // indirect
5+
require golang.org/x/text v0.15.0 // indirect
66

77
replace github.com/issue9/localeutil => ../../..
88

Diff for: message/extract/testdata/go.sum

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github.com/issue9/assert/v4 v4.1.1 h1:OhPE8SB8n/qZCNGLQa+6MQtr/B3oON0JAVj68k8jJlc=
2-
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
3-
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
1+
github.com/issue9/assert/v4 v4.3.0 h1:W3XDKmttsfzihYGxJ9rJoL2ViJgWERB9IxfHcxjv65U=
2+
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
3+
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=

0 commit comments

Comments
 (0)