change the regular expression to fix the issue #853 caused by PR #837 (…

…#854)
swaggo · Dec 9, 2020 · 3d90fc0 · 3d90fc0
1 parent 98b8c70
commit 3d90fc0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/operation.go b/operation.go
@@ -603,9 +603,9 @@ func findTypeDef(importPath, typeName string) (*ast.TypeSpec, error) {
 	return nil, fmt.Errorf("type spec not found")
 }
 
-var responsePattern = regexp.MustCompile(`([\w,]+)[\s]+([\w\{\}]+)[\s]+([\w\-\.\/\{\}=,\[\]]+)[^"]*(.*)?`)
+var responsePattern = regexp.MustCompile(`^([\w,]+)[\s]+([\w\{\}]+)[\s]+([\w\-\.\/\{\}=,\[\]]+)[^"]*(.*)?`)
 
-//RepsonseType{data1=Type1,data2=Type2}
+//ResponseType{data1=Type1,data2=Type2}
 var combinedPattern = regexp.MustCompile(`^([\w\-\.\/\[\]]+)\{(.*)\}$`)
 
 func (operation *Operation) parseObjectSchema(refType string, astFile *ast.File) (*spec.Schema, error) {
@@ -748,13 +748,13 @@ func (operation *Operation) ParseResponseComment(commentLine string, astFile *as
 			operation.DefaultResponse().Schema = schema
 			operation.DefaultResponse().Description = responseDescription
 		} else if code, err := strconv.Atoi(codeStr); err == nil {
-			if responseDescription == "" {
-				responseDescription = http.StatusText(code)
-			}
-
-			operation.AddResponse(code, &spec.Response{
+			resp := &spec.Response{
 				ResponseProps: spec.ResponseProps{Schema: schema, Description: responseDescription},
-			})
+			}
+			if resp.Description == "" {
+				resp.Description = http.StatusText(code)
+			}
+			operation.AddResponse(code, resp)
 		} else {
 			return fmt.Errorf("can not parse response comment \"%s\"", commentLine)
 		}

diff --git a/operation_test.go b/operation_test.go
@@ -672,7 +672,7 @@ func TestParseResponseCommentWithBasicType(t *testing.T) {
 }
 
 func TestParseResponseCommentWithBasicTypeAndCodes(t *testing.T) {
-	comment := `@Success 200,201,default {string} string "it's ok'"`
+	comment := `@Success 200,201,default {string} string "it's ok"`
 	operation := NewOperation(nil)
 	err := operation.ParseComment(comment, nil)
 	assert.NoError(t, err, "ParseComment should not fail")
@@ -681,19 +681,19 @@ func TestParseResponseCommentWithBasicTypeAndCodes(t *testing.T) {
 	expected := `{
     "responses": {
         "200": {
-            "description": "it's ok'",
+            "description": "it's ok",
             "schema": {
                 "type": "string"
             }
         },
         "201": {
-            "description": "it's ok'",
+            "description": "it's ok",
             "schema": {
                 "type": "string"
             }
         },
         "default": {
-            "description": "it's ok'",
+            "description": "it's ok",
             "schema": {
                 "type": "string"
             }
@@ -704,7 +704,7 @@ func TestParseResponseCommentWithBasicTypeAndCodes(t *testing.T) {
 }
 
 func TestParseEmptyResponseComment(t *testing.T) {
-	comment := `@Success 200 "it's ok"`
+	comment := `@Success 200 "it is ok"`
 	operation := NewOperation(nil)
 	err := operation.ParseComment(comment, nil)
 	assert.NoError(t, err, "ParseComment should not fail")
@@ -714,15 +714,15 @@ func TestParseEmptyResponseComment(t *testing.T) {
 	expected := `{
     "responses": {
         "200": {
-            "description": "it's ok"
+            "description": "it is ok"
         }
     }
 }`
 	assert.Equal(t, expected, string(b))
 }
 
 func TestParseEmptyResponseCommentWithCodes(t *testing.T) {
-	comment := `@Success 200,201,default "it's ok"`
+	comment := `@Success 200,201,default "it is ok"`
 	operation := NewOperation(nil)
 	err := operation.ParseComment(comment, nil)
 	assert.NoError(t, err, "ParseComment should not fail")
@@ -732,13 +732,13 @@ func TestParseEmptyResponseCommentWithCodes(t *testing.T) {
 	expected := `{
     "responses": {
         "200": {
-            "description": "it's ok"
+            "description": "it is ok"
         },
         "201": {
-            "description": "it's ok"
+            "description": "it is ok"
         },
         "default": {
-            "description": "it's ok"
+            "description": "it is ok"
         }
     }
 }`