fix bug: enums of explicit type conversion (#1556)

Signed-off-by: sdghchj <sdghchj@qq.com>
swaggo · Apr 17, 2023 · c14cc8e · c14cc8e
1 parent 01d20cc
commit c14cc8e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/package.go b/package.go
@@ -158,19 +158,18 @@ func (pkg *PackageDefinitions) evaluateConstValue(file *ast.File, iota int, expr
 			if name == "uintptr" {
 				name = "uint"
 			}
+			value, _ := pkg.evaluateConstValue(file, iota, arg, globalEvaluator, recursiveStack)
 			if IsGolangPrimitiveType(name) {
-				value, _ := pkg.evaluateConstValue(file, iota, arg, globalEvaluator, recursiveStack)
 				value = EvaluateDataConversion(value, name)
 				return value, nil
 			} else if name == "len" {
-				value, _ := pkg.evaluateConstValue(file, iota, arg, globalEvaluator, recursiveStack)
 				return reflect.ValueOf(value).Len(), nil
 			}
 			typeDef := globalEvaluator.FindTypeSpec(name, file)
 			if typeDef == nil {
 				return nil, nil
 			}
-			return arg, valueExpr.Fun
+			return value, valueExpr.Fun
 		} else if selector, ok := valueExpr.Fun.(*ast.SelectorExpr); ok {
 			typeDef := globalEvaluator.FindTypeSpec(fullTypeName(selector.X.(*ast.Ident).Name, selector.Sel.Name), file)
 			if typeDef == nil {

diff --git a/testdata/enums/expected.json b/testdata/enums/expected.json
@@ -118,7 +118,8 @@
                             1,
                             2,
                             4,
-                            8
+                            8,
+                            3
                         ],
                         "type": "integer",
                         "x-enum-comments": {
@@ -131,7 +132,8 @@
                             "Mask1",
                             "Mask2",
                             "Mask3",
-                            "Mask4"
+                            "Mask4",
+                            "Mask5"
                         ],
                         "name": "mask",
                         "in": "formData"
@@ -197,7 +199,8 @@
                                 1,
                                 2,
                                 4,
-                                8
+                                8,
+                                3
                             ],
                             "type": "integer"
                         },
@@ -268,7 +271,8 @@
                 1,
                 2,
                 4,
-                8
+                8,
+                3
             ],
             "x-enum-comments": {
                 "Mask1": "Mask1",
@@ -280,7 +284,8 @@
                 "Mask1",
                 "Mask2",
                 "Mask3",
-                "Mask4"
+                "Mask4",
+                "Mask5"
             ]
         },
         "types.Person": {

diff --git a/testdata/enums/types/model.go b/testdata/enums/types/model.go
@@ -30,6 +30,7 @@ const (
 	Mask2                          /* Mask2 */
 	Mask3                          // Mask3
 	Mask4                          // Mask4
+	Mask5 = Mask(A + B)
 )
 
 type Type string