fix: fix metadata bug

things-go · Apr 29, 2024 · cfe288a · cfe288a
1 parent 80ecbe8
commit cfe288a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 4 deletions.
diff --git a/cmd/protoc-gen-dyn-gin/gin.go b/cmd/protoc-gen-dyn-gin/gin.go
@@ -365,12 +365,19 @@ func lineComment(s string) string {
 		return ""
 	}
 	b := &strings.Builder{}
+	first := true
 	lines := strings.Split(strings.TrimSuffix(s, "\n"), "\n")
-	for i, line := range lines {
-		b.WriteString(strings.TrimSpace(strings.TrimPrefix(line, "//")))
-		if i+1 < len(lines) {
+	for _, line := range lines {
+		ss := strings.TrimSpace(strings.TrimPrefix(line, "//"))
+		if ss == "" {
+			continue
+		}
+		if !first {
 			b.WriteString(", ")
+		} else {
+			first = false
 		}
+		b.WriteString(ss)
 	}
 	return b.String()
 }
diff --git a/example/gen/hello/hello.gin.pb.go b/example/gen/hello/hello.gin.pb.go
diff --git a/example/gen/hello/hello.resty.pb.go b/example/gen/hello/hello.resty.pb.go
diff --git a/example/gen/hello/hello_grpc.pb.go b/example/gen/hello/hello_grpc.pb.go
diff --git a/example/proto/hello/hello.proto b/example/proto/hello/hello.proto
@@ -12,6 +12,8 @@ import "google/api/annotations.proto";
 // The greeting service definition.
 service Greeter {
   // Sends a hello
+  //
+  // 多一行
   rpc SayHello(HelloRequest) returns (HelloReply) {  // I am a trailing comment
     option (google.api.http) = {
       post: "/v1/hello",