Issue59

option.go

@@ -153,6 +153,8 @@ func (l *Literal) parse(p *Parser) error {
 type NamedLiteral struct {
 	*Literal
 	Name string
+	// PrintsColon is true when the Name must be printed with a colon suffix
+	PrintsColon bool
 }
 
 // parseAggregate reads options written using aggregate syntax.
@@ -189,8 +191,22 @@ func parseAggregateConstants(p *Parser, container interface{}) (list []*NamedLit
 			err = p.unexpected(lit, "option aggregate key", container)
 			return
 		}
+		// workaround issue #59 TODO
+		if isString(lit) && len(list) > 0 {
+			// concatenate with previous constant
+			list[len(list)-1].Source += unQuote(lit)
+			continue
+		}
 		key := lit
+		printsColon := false
+		// expect colon, aggregate or plain literal
 		pos, tok, lit = p.next()
+		if tCOLON == tok {
+			// consume it
+			printsColon = true
+			pos, tok, lit = p.next()
+		}
+		// see if nested aggregate is started
 		if tLEFTCURLY == tok {
 			nested, fault := parseAggregateConstants(p, container)
 			if fault != nil {
@@ -206,15 +222,14 @@ func parseAggregateConstants(p *Parser, container interface{}) (list []*NamedLit
 			}
 			continue
 		}
-		if tCOLON != tok {
-			err = p.unexpected(lit, "option aggregate key colon :", container)
-			return
-		}
+		// no aggregate, put back token
+		p.nextPut(pos, tok, lit)
+		// now we see plain literal
 		l := new(Literal)
 		l.Position = pos
 		if err = l.parse(p); err != nil {
 			return
 		}
-		list = append(list, &NamedLiteral{Name: key, Literal: l})
+		list = append(list, &NamedLiteral{Name: key, Literal: l, PrintsColon: printsColon})
 	}
 }

option_test.go

@@ -294,3 +294,28 @@ func TestNestedAggregateConstants(t *testing.T) {
 		t.Errorf("got [%v] want [%v]", got, want)
 	}
 }
+
+// Issue #59
+func TestMultiLineOptionAggregateValue(t *testing.T) {
+	src := `rpc ListTransferLogs(ListTransferLogsRequest)
+	returns (ListTransferLogsResponse) {
+		option (google.api.http) = {
+		get: "/v1/{parent=projects/*/locations/*/transferConfigs/*/runs/*}/"
+			"transferLogs"
+		};
+}`
+	p := newParserOn(src)
+	rpc := new(RPC)
+	p.next()
+	err := rpc.parse(p)
+	if err != nil {
+		t.Error(err)
+	}
+	get := rpc.Options[0].AggregatedConstants[0]
+	if got, want := get.Name, "get"; got != want {
+		t.Errorf("got [%v] want [%v]", got, want)
+	}
+	if got, want := get.Literal.Source, "/v1/{parent=projects/*/locations/*/transferConfigs/*/runs/*}/transferLogs"; got != want {
+		t.Errorf("got [%v] want [%v]", got, want)
+	}
+}