improve comment replacement regex pattern for command gen service (#…

…2846)
gogf · Aug 8, 2023 · 243fe73 · 243fe73
1 parent 932f8c4
commit 243fe73
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmd/gf/internal/cmd/genservice/genservice.go b/cmd/gf/internal/cmd/genservice/genservice.go
@@ -194,7 +194,7 @@ func (c CGenService) Service(ctx context.Context, in CGenServiceInput) (out *CGe
 				return nil, err
 			}
 			// remove all comments.
-			fileContent, err = gregex.ReplaceString(`//(.*)|(?s)/\*(.*?)\*/`, "", fileContent)
+			fileContent, err = gregex.ReplaceString(`(//.*)|((?s)/\*.*?\*/)`, "", fileContent)
 			if err != nil {
 				return nil, err
 			}

diff --git a/cmd/gf/internal/cmd/genservice/genservice_generate.go b/cmd/gf/internal/cmd/genservice/genservice_generate.go
@@ -137,7 +137,7 @@ func (c CGenService) isToGenerateServiceGoFile(dstPackageName, filePath string,
 		return true
 	}
 	// remove all comments.
-	fileContent, err = gregex.ReplaceString(`/[/|\*](.*)`, "", fileContent)
+	fileContent, err = gregex.ReplaceString(`(//.*)|((?s)/\*.*?\*/)`, "", fileContent)
 	if err != nil {
 		panic(err)
 		return false