Merge pull request #6 from heyitsanthony/flush-comments

parse: flush comment slice when current line is not a comment

Author: Anthony Romano

parse/parse.go

@@ -134,6 +134,8 @@ func ReadFile(fpath string) (*Proto, error) {
 			comments = append(comments, strings.TrimSpace(ls))
 			continue
 		}
+		emitComments := comments
+		comments = []string{}
 
 		// skippin enum
 		if strings.HasPrefix(line, "enum ") {
@@ -187,14 +189,12 @@ func ReadFile(fpath string) (*Proto, error) {
 					switch mode {
 					case parsingMessage: // message Name
 						protoMessage.Name = strings.Replace(elem, "{", "", -1)
-						protoMessage.Description = strings.Join(comments, " ")
-						comments = []string{}                // reset
+						protoMessage.Description = strings.Join(emitComments, " ")
 						protoMessage.Fields = []ProtoField{} // reset
 
 					case parsingService: // service Name
 						protoService.Name = strings.Replace(elem, "{", "", -1)
-						protoService.Description = strings.Join(comments, " ")
-						comments = []string{}                  // reset
+						protoService.Description = strings.Join(emitComments, " ")
 						protoService.Methods = []ProtoMethod{} // reset
 					}
 				}
@@ -205,7 +205,6 @@ func ReadFile(fpath string) (*Proto, error) {
 				protoMessage.FilePath = fs
 				rp.Messages = append(rp.Messages, protoMessage)
 				protoMessage = ProtoMessage{}
-				comments = []string{}
 				mode = reading
 				continue
 			}
@@ -227,9 +226,8 @@ func ReadFile(fpath string) (*Proto, error) {
 			}
 
 			protoField.Name = fds[1]
-			protoField.Description = strings.Join(comments, " ")
+			protoField.Description = strings.Join(emitComments, " ")
 			protoMessage.Fields = append(protoMessage.Fields, protoField)
-			comments = []string{}
 
 		case parsingService:
 			// parse 'rpc Watch(stream WatchRequest) returns (stream WatchResponse) {}'
@@ -253,15 +251,13 @@ func ReadFile(fpath string) (*Proto, error) {
 				protoMethod.Name = f1
 				protoMethod.RequestType = f2
 				protoMethod.ResponseType = f3
-				protoMethod.Description = strings.Join(comments, " ")
+				protoMethod.Description = strings.Join(emitComments, " ")
 				protoService.Methods = append(protoService.Methods, protoMethod)
-				comments = []string{}
 			} else if !strings.HasSuffix(line, "{}") && strings.HasSuffix(line, "}") {
 				// end of service
 				protoService.FilePath = fs
 				rp.Services = append(rp.Services, protoService)
 				protoService = ProtoService{}
-				comments = []string{}
 				mode = reading
 			}
 		}

parse/testdata/README.md

@@ -1,6 +1,3 @@
-this is test...
-
-
 ### etcdserverpb
 
 
@@ -38,8 +35,6 @@ this is test...
 
 ##### service `KV` (testdata/rpc.proto)
 
-for grpc-gateway
-
 | Method | Request Type | Response Type | Description |
 | ------ | ------------ | ------------- | ----------- |
 | Range | RangeRequest | RangeResponse | Range gets the keys in the range from the key-value store. |
@@ -91,8 +86,6 @@ for grpc-gateway
 
 ##### message `AlarmRequest` (testdata/rpc.proto)
 
-default, used to query if any alarm is active space quota is exhausted
-
 | Field | Description | Type | Go | Java | Python | C++ |
 | ----- | ----------- | ---- | --- | ---- | ------ | --- |
 | action | action is the kind of alarm request to issue. The action may GET alarm statuses, ACTIVATE an alarm, or DEACTIVATE a raised alarm. | AlarmAction | | | | |
@@ -635,7 +628,7 @@ Empty field.
 
 | Field | Description | Type | Go | Java | Python | C++ |
 | ----- | ----------- | ---- | --- | ---- | ------ | --- |
-| key | default, no sorting lowest target value first highest target value first key is the first key for the range. If range_end is not given, the request only looks up key. | bytes | []byte | ByteString | str | string |
+| key | key is the first key for the range. If range_end is not given, the request only looks up key. | bytes | []byte | ByteString | str | string |
 | range_end | range_end is the upper bound on the requested range [key, range_end). If range_end is '\0', the range is all keys >= key. If the range_end is one bit larger than the given key, then the range requests get the all keys with the prefix (the given key). If both key and range_end are '\0', then range requests returns all keys. | bytes | []byte | ByteString | str | string |
 | limit | limit is a limit on the number of keys returned for the request. | int64 | int64 | long | int/long | int64 |
 | revision | revision is the point-in-time of the key-value store to use for the range. If revision is less or equal to zero, the range is over the newest key-value store. If the revision has been compacted, ErrCompacted is returned as a response. | int64 | int64 | long | int/long | int64 |