Fix code review comments

gen/gen.go

@@ -149,12 +149,12 @@ func (g *Gen) Build(config *Config) error {
 		swag.SetCodeExamplesDirectory(config.CodeExampleFilesDir),
 		swag.SetStrict(config.Strict),
 		swag.SetOverrides(overrides),
+		swag.ParseUsingGoList(config.ParseGoList),
 	)
 	p.PropNamingStrategy = config.PropNamingStrategy
 	p.ParseVendor = config.ParseVendor
 	p.ParseDependency = config.ParseDependency
 	p.ParseInternal = config.ParseInternal
-	p.ParseGoList = config.ParseGoList
 
 	if err := p.ParseAPIMultiSearchDir(searchDirs, config.MainAPIFile, config.ParseDepth); err != nil {
 		return err

golist.go

@@ -11,8 +11,7 @@ import (
 )
 
 func listPackages(ctx context.Context, dir string, env []string, args ...string) (pkgs []*build.Package, finalErr error) {
-	goArgs := append([]string{"list", "-json", "-e"}, args...)
-	cmd := exec.CommandContext(ctx, "go", goArgs...)
+	cmd := exec.CommandContext(ctx, "go", append([]string{"list", "-json", "-e"}, args...)...)
 	cmd.Env = env
 	cmd.Dir = dir
 
@@ -28,18 +27,21 @@ func listPackages(ctx context.Context, dir string, env []string, args ...string)
 		}
 	}()
 
-	if err := cmd.Start(); err != nil {
+	err = cmd.Start()
+	if err != nil {
 		return nil, err
 	}
 	dec := json.NewDecoder(stdout)
 	for dec.More() {
 		var pkg build.Package
-		if err := dec.Decode(&pkg); err != nil {
+		err = dec.Decode(&pkg)
+		if err != nil {
 			return nil, err
 		}
 		pkgs = append(pkgs, &pkg)
 	}
-	if err := cmd.Wait(); err != nil {
+	err = cmd.Wait()
+	if err != nil {
 		return nil, err
 	}
 	return pkgs, nil
@@ -57,16 +59,17 @@ func (parser *Parser) getAllGoFileInfoFromDepsByList(pkg *build.Package) error {
 	}
 
 	srcDir := pkg.Dir
+	var err error
 	for i := range pkg.GoFiles {
-		path := filepath.Join(srcDir, pkg.GoFiles[i])
-		if err := parser.parseFile(pkg.ImportPath, path, nil); err != nil {
+		err = parser.parseFile(pkg.ImportPath, filepath.Join(srcDir, pkg.GoFiles[i]), nil)
+		if err != nil {
 			return err
 		}
 	}
 
 	for i := range pkg.CFiles {
-		path := filepath.Join(srcDir, pkg.CFiles[i])
-		if err := parser.parseFile(pkg.ImportPath, path, nil); err != nil {
+		err = parser.parseFile(pkg.ImportPath, filepath.Join(srcDir, pkg.CFiles[i]), nil)
+		if err != nil {
 			return err
 		}
 	}

parser.go

@@ -142,8 +142,8 @@ type Parser struct {
 	// Overrides allows global replacements of types. A blank replacement will be skipped.
 	Overrides map[string]string
 
-	// ParseGoList whether swag use go list to parse dependency
-	ParseGoList bool
+	// parseGoList whether swag use go list to parse dependency
+	parseGoList bool
 }
 
 // FieldParserFactory create FieldParser
@@ -261,6 +261,13 @@ func SetOverrides(overrides map[string]string) func(parser *Parser) {
 	}
 }
 
+// ParseUsingGoList sets whether swag use go list to parse dependency
+func ParseUsingGoList(enabled bool) func(parser *Parser) {
+	return func(p *Parser) {
+		p.parseGoList = enabled
+	}
+}
+
 // ParseAPI parses general api info for given searchDir and mainAPIFile.
 func (parser *Parser) ParseAPI(searchDir string, mainAPIFile string, parseDepth int) error {
 	return parser.ParseAPIMultiSearchDir([]string{searchDir}, mainAPIFile, parseDepth)
@@ -289,7 +296,7 @@ func (parser *Parser) ParseAPIMultiSearchDir(searchDirs []string, mainAPIFile st
 
 	// Use 'go list' command instead of depth.Resolve()
 	if parser.ParseDependency {
-		if parser.ParseGoList {
+		if parser.parseGoList {
 			pkgs, err := listPackages(context.Background(), filepath.Dir(absMainAPIFilePath), nil, "-deps")
 			if err != nil {
 				return fmt.Errorf("pkg %s cannot find all dependencies, %s", filepath.Dir(absMainAPIFilePath), err)

parser_test.go

@@ -2132,7 +2132,7 @@ func TestParseGoList(t *testing.T) {
 	mainAPIFile := "main.go"
 	p := New()
 	p.ParseDependency = true
-	p.ParseGoList = true
+	p.parseGoList = true
 	err := p.ParseAPI(searchDir, mainAPIFile, defaultParseDepth)
 	assert.NoError(t, err)
 }