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

chore: coding style (#2120)

Browse Source
This commit is contained in:
Kevin Wan
2022-07-10 11:05:21 +08:00
committed by GitHub
parent 96acf1f5a6
commit 1c09db6d5d
11 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/goctl/api/format/format_test.go
View File

@@ -65,7 +65,7 @@ func Test_apiFormatReader_issue1721(t *testing.T) {
require.NoError(t, err)
filename := path.Join(subDir, "bar.api")
err = ioutil.WriteFile(filename, []byte(fmt.Sprintf(`import "%s"`, importedFilename)), 0644)
err = ioutil.WriteFile(filename, []byte(fmt.Sprintf(`import "%s"`, importedFilename)), 0o644)
require.NoError(t, err)
f, err := os.Open(filename)

3
tools/goctl/api/gogen/genhandlers.go
View File

@@ -60,7 +60,8 @@ func genHandler(dir, rootPkg string, cfg *config.Config, group spec.Group, route
}
func doGenToFile(dir, handler string, cfg *config.Config, group spec.Group,
route spec.Route, handleObj handlerInfo) error {
route spec.Route, handleObj handlerInfo,
) error {
filename, err := format.FileNamingFormat(cfg.NamingFormat, handler)
if err != nil {
return err

1
tools/goctl/api/parser/g4/ast/apiparser.go
View File

@@ -254,7 +254,6 @@ func (p *Parser) storeVerificationInfo(api *Api) {
}
func (p *Parser) valid(nestedApi *Api) error {
if p.syntax != nil && nestedApi.Syntax != nil {
if p.syntax.Version.Text() != nestedApi.Syntax.Version.Text() {
syntaxToken := nestedApi.Syntax.Syntax

18
tools/goctl/api/parser/g4/ast/apiparser_test.go
View File

@@ -25,13 +25,13 @@ func Test_ImportCycle(t *testing.T) {
defer os.RemoveAll(dir)
mainPath := filepath.Join(dir, mainFilename)
err = ioutil.WriteFile(mainPath, []byte(mainSrc), 0777)
err = ioutil.WriteFile(mainPath, []byte(mainSrc), 0o777)
require.NoError(t, err)
subAPath := filepath.Join(dir, subAFilename)
err = ioutil.WriteFile(subAPath, []byte(subASrc), 0777)
err = ioutil.WriteFile(subAPath, []byte(subASrc), 0o777)
require.NoError(t, err)
subBPath := filepath.Join(dir, subBFilename)
err = ioutil.WriteFile(subBPath, []byte(subBSrc), 0777)
err = ioutil.WriteFile(subBPath, []byte(subBSrc), 0o777)
require.NoError(t, err)
_, err = NewParser().Parse(mainPath)
@@ -55,13 +55,13 @@ func Test_MultiImportedShouldAllowed(t *testing.T) {
defer os.RemoveAll(dir)
mainPath := filepath.Join(dir, mainFilename)
err = ioutil.WriteFile(mainPath, []byte(mainSrc), 0777)
err = ioutil.WriteFile(mainPath, []byte(mainSrc), 0o777)
require.NoError(t, err)
subAPath := filepath.Join(dir, subAFilename)
err = ioutil.WriteFile(subAPath, []byte(subASrc), 0777)
err = ioutil.WriteFile(subAPath, []byte(subASrc), 0o777)
require.NoError(t, err)
subBPath := filepath.Join(dir, subBFilename)
err = ioutil.WriteFile(subBPath, []byte(subBSrc), 0777)
err = ioutil.WriteFile(subBPath, []byte(subBSrc), 0o777)
require.NoError(t, err)
_, err = NewParser().Parse(mainPath)
@@ -84,13 +84,13 @@ func Test_RedundantDeclarationShouldNotBeAllowed(t *testing.T) {
defer os.RemoveAll(dir)
mainPath := filepath.Join(dir, mainFilename)
err = ioutil.WriteFile(mainPath, []byte(mainSrc), 0777)
err = ioutil.WriteFile(mainPath, []byte(mainSrc), 0o777)
require.NoError(t, err)
subAPath := filepath.Join(dir, subAFilename)
err = ioutil.WriteFile(subAPath, []byte(subASrc), 0777)
err = ioutil.WriteFile(subAPath, []byte(subASrc), 0o777)
require.NoError(t, err)
subBPath := filepath.Join(dir, subBFilename)
err = ioutil.WriteFile(subBPath, []byte(subBSrc), 0777)
err = ioutil.WriteFile(subBPath, []byte(subBSrc), 0o777)
require.NoError(t, err)
_, err = NewParser().Parse(mainPath)