Ver código fonte

fix: fix conflict with the import package name (#2610)

Co-authored-by: chenjieping <chenjieping@kezaihui.com>
Co-authored-by: Kevin Wan <wanjunfeng@gmail.com>
chensy 2 anos atrás
pai
commit
20e659749a
1 arquivos alterados com 8 adições e 8 exclusões
  1. 8 8
      tools/goctl/api/parser/parser.go

+ 8 - 8
tools/goctl/api/parser/parser.go

@@ -18,19 +18,19 @@ type parser struct {
 // Parse parses the api file
 func Parse(filename string) (*spec.ApiSpec, error) {
 	astParser := ast.NewParser(ast.WithParserPrefix(filepath.Base(filename)), ast.WithParserDebug())
-	ast, err := astParser.Parse(filename)
+	parsedApi, err := astParser.Parse(filename)
 	if err != nil {
 		return nil, err
 	}
 
-	spec := new(spec.ApiSpec)
-	p := parser{ast: ast, spec: spec}
+	apiSpec := new(spec.ApiSpec)
+	p := parser{ast: parsedApi, spec: apiSpec}
 	err = p.convert2Spec()
 	if err != nil {
 		return nil, err
 	}
 
-	return spec, nil
+	return apiSpec, nil
 }
 
 func parseContent(content string, skipCheckTypeDeclaration bool, filename ...string) (*spec.ApiSpec, error) {
@@ -40,19 +40,19 @@ func parseContent(content string, skipCheckTypeDeclaration bool, filename ...str
 	} else {
 		astParser = ast.NewParser()
 	}
-	ast, err := astParser.ParseContent(content, filename...)
+	parsedApi, err := astParser.ParseContent(content, filename...)
 	if err != nil {
 		return nil, err
 	}
 
-	spec := new(spec.ApiSpec)
-	p := parser{ast: ast, spec: spec}
+	apiSpec := new(spec.ApiSpec)
+	p := parser{ast: parsedApi, spec: apiSpec}
 	err = p.convert2Spec()
 	if err != nil {
 		return nil, err
 	}
 
-	return spec, nil
+	return apiSpec, nil
 }
 
 // ParseContent parses the api content