zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(goctl): api format with reader input (#1722)

Browse Source 
resolves #1721
This commit is contained in:
Fyn
2022-03-31 00:20:51 +08:00
committed by GitHub
parent e9620c8c05
commit 500bd87c85
2 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/goctl/api/format/format.go
View File

@@ -6,6 +6,7 @@ import (
"fmt"
"go/format"
"go/scanner"
"io"
"io/ioutil"
"os"
"path/filepath"
@@ -29,14 +30,14 @@ const (
func GoFormatApi(c *cli.Context) error {
useStdin := c.Bool("stdin")
skipCheckDeclare := c.Bool("declare")
dir := c.String("dir")
var be errorx.BatchError
if useStdin {
if err := apiFormatByStdin(skipCheckDeclare); err != nil {
if err := apiFormatReader(os.Stdin, dir, skipCheckDeclare); err != nil {
be.Add(err)
}
} else {
dir := c.String("dir")
if len(dir) == 0 {
return errors.New("missing -dir")
}
@@ -65,13 +66,14 @@ func GoFormatApi(c *cli.Context) error {
return be.Err()
}
func apiFormatByStdin(skipCheckDeclare bool) error {
data, err := ioutil.ReadAll(os.Stdin)
// apiFormatReader
// filename is needed when there are `import` literals.
func apiFormatReader(reader io.Reader, filename string, skipCheckDeclare bool) error {
data, err := ioutil.ReadAll(reader)
if err != nil {
return err
}
result, err := apiFormat(string(data), skipCheckDeclare)
result, err := apiFormat(string(data), skipCheckDeclare, filename)
if err != nil {
return err
}