Skip to content

Commit 8881114

Browse files
committed
nvim: refactor api_tool.go
Signed-off-by: Koichi Shiraishi <[email protected]>
1 parent 7642208 commit 8881114

File tree

1 file changed

+19
-16
lines changed

1 file changed

+19
-16
lines changed

nvim/api_tool.go

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func parseAPIDef() ([]*Function, []*Function, error) {
130130
}
131131

132132
var functions []*Function
133-
var deprecateds []*Function
133+
var deprecated []*Function
134134

135135
for _, decl := range file.Decls {
136136
fdecl, ok := decl.(*ast.FuncDecl)
@@ -191,13 +191,13 @@ func parseAPIDef() ([]*Function, []*Function, error) {
191191
}
192192

193193
if m.DeprecatedSince > 0 {
194-
deprecateds = append(deprecateds, m)
194+
deprecated = append(deprecated, m)
195195
continue
196196
}
197197
functions = append(functions, m)
198198
}
199199

200-
return functions, deprecateds, nil
200+
return functions, deprecated, nil
201201
}
202202

203203
const genTemplate = `
@@ -622,27 +622,30 @@ func main() {
622622
return
623623
}
624624

625-
functions, deprecateds, err := parseAPIDef()
625+
functions, deprecated, err := parseAPIDef()
626626
if err != nil {
627627
log.Fatal(err)
628628
}
629629

630630
switch {
631631
case *compareFlag:
632-
functions = append(functions, deprecateds...)
633-
err = compareFunctions(functions)
634-
default:
635-
if *generateFlag != "" {
636-
if *deprecatedFlag == "" {
637-
functions = append(functions, deprecateds...)
638-
}
639-
err = printImplementation(functions, implementationTemplate, *generateFlag)
632+
functions = append(functions, deprecated...)
633+
if err := compareFunctions(functions); err != nil {
634+
log.Fatal(err)
635+
}
636+
637+
case *generateFlag != "":
638+
if *deprecatedFlag == "" {
639+
functions = append(functions, deprecated...)
640+
}
641+
if err := printImplementation(functions, implementationTemplate, *generateFlag); err != nil {
642+
log.Fatal(err)
640643
}
644+
641645
if *deprecatedFlag != "" {
642-
err = printImplementation(deprecateds, deprecatedTemplate, *deprecatedFlag)
646+
if err := printImplementation(deprecated, deprecatedTemplate, *deprecatedFlag); err != nil {
647+
log.Fatal(err)
648+
}
643649
}
644650
}
645-
if err != nil {
646-
log.Fatal(err)
647-
}
648651
}

0 commit comments

Comments
 (0)