Skip to content

Commit

Permalink
code optimized (zeromicro#382)
Browse files Browse the repository at this point in the history
  • Loading branch information
kingxt authored Jan 13, 2021
1 parent 9cd2015 commit 7f49bd8
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 7 deletions.
17 changes: 10 additions & 7 deletions tools/goctl/api/format/format.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,12 @@ func GoFormatApi(c *cli.Context) error {
})
be.Add(err)
}

if be.NotNil() {
scanner.PrintError(os.Stderr, be.Err())
os.Exit(1)
}

return be.Err()
}

Expand All @@ -73,10 +75,7 @@ func ApiFormatByStdin() error {
}

_, err = fmt.Print(result)
if err != nil {
return err
}
return nil
return err
}

func ApiFormatByPath(apiFilePath string) error {
Expand All @@ -90,10 +89,12 @@ func ApiFormatByPath(apiFilePath string) error {
return err
}

if err := ioutil.WriteFile(apiFilePath, []byte(result), os.ModePerm); err != nil {
_, err = parser.ParseContent(result)
if err != nil {
return err
}
return nil

return ioutil.WriteFile(apiFilePath, []byte(result), os.ModePerm)
}

func apiFormat(data string) (string, error) {
Expand Down Expand Up @@ -150,6 +151,7 @@ func apiFormat(data string) (string, error) {
}
preLine = line
}

return strings.TrimSpace(builder.String()), nil
}

Expand Down Expand Up @@ -178,9 +180,9 @@ func formatGoTypeDef(line string, scanner *bufio.Scanner, builder *strings.Build
break
}
}

return true, nil
}

return false, nil
}

Expand Down Expand Up @@ -212,5 +214,6 @@ func mayInsertStructKeyword(line string, token *int) string {
if strings.Contains(noCommentLine, "`") {
return util.UpperFirst(strings.TrimSpace(line))
}

return line
}
5 changes: 5 additions & 0 deletions tools/goctl/api/parser/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,11 @@ func (p parser) fieldToMember(field *ast.TypeField) spec.Member {
var tag = ""
if !field.IsAnonymous {
name = field.Name.Text()
if field.Tag == nil {
panic(fmt.Sprintf("error: line %d:%d field %s has no tag", field.Name.Line(), field.Name.Column(),
field.Name.Text()))
}

tag = field.Tag.Text()
}
return spec.Member{
Expand Down

0 comments on commit 7f49bd8

Please sign in to comment.