allow oneof and service to have option, issue emicklei#43 (emicklei#62)

oneof.go

@@ -90,6 +90,14 @@ func (o *Oneof) parse(p *Parser) error {
 				return err
 			}
 			o.Elements = append(o.Elements, g)
+		case tOPTION:
+			opt := new(Option)
+			opt.Position = pos
+			opt.Comment, o.Elements = takeLastCommentIfEndsOnLine(o.elements(), pos.Line-1)
+			if err := opt.parse(p); err != nil {
+				return err
+			}
+			o.Elements = append(o.Elements, opt)
 		case tSEMICOLON:
 			maybeScanInlineComment(p, o)
 			// continue

oneof_test.go

@@ -95,3 +95,20 @@ func TestFieldOneofImported(t *testing.T) {
 		t.Errorf("got [%v] want [%v]", got, want)
 	}
 }
+
+func TestOneOfWithOption(t *testing.T) {
+	src := `oneof AnOneof {
+		option (oneof_opt1) = -99;
+		int32 oneof_field = 2;
+	  }`
+	p := newParserOn(src)
+	p.next()
+	oneof := new(Oneof)
+	err := oneof.parse(p)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if got, want := oneof.Elements[0].(*Option).Name, "(oneof_opt1)"; got != want {
+		t.Errorf("got [%v] want [%v]", got, want)
+	}
+}

service.go

@@ -82,6 +82,14 @@ func (s *Service) parse(p *Parser) error {
 			if com := mergeOrReturnComment(s.Elements, lit, pos); com != nil { // not merged?
 				s.Elements = append(s.Elements, com)
 			}
+		case tOPTION:
+			opt := new(Option)
+			opt.Position = pos
+			opt.Comment, s.Elements = takeLastCommentIfEndsOnLine(s.elements(), pos.Line-1)
+			if err := opt.parse(p); err != nil {
+				return err
+			}
+			s.Elements = append(s.Elements, opt)
 		case tRPC:
 			rpc := new(RPC)
 			rpc.Position = pos

service_test.go

@@ -129,3 +129,19 @@ func TestRPCWithOptionAggregateSyntax(t *testing.T) {
 		t.Errorf("got len Options %v want %v", got, want)
 	}
 }
+
+func TestServiceWithOption(t *testing.T) {
+	src := `service AnyService {
+		option secure = true;
+	  }`
+	p := newParserOn(src)
+	p.next()
+	svc := new(Service)
+	err := svc.parse(p)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if got, want := svc.Elements[0].(*Option).Name, "secure"; got != want {
+		t.Errorf("got [%v] want [%v]", got, want)
+	}
+}