fix full ident with parenthesis formatting

Change-Id: I16e078cbdae1aece7d77a808b9b3e9ba02177a9d

enum_test.go

@@ -30,7 +30,7 @@ enum EnumAllowingAlias {
 	if got, want := ef3.Integer, 2; got != want {
 		t.Errorf("got [%v] want [%v]", got, want)
 	}
-	if got, want := ef3.ValueOption.Name, "custom_option"; got != want {
+	if got, want := ef3.ValueOption.Name, "(custom_option)"; got != want {
 		t.Errorf("got [%v] want [%v]", got, want)
 	}
 	if got, want := ef3.ValueOption.Constant.Source, "hello world"; got != want {

option.go

@@ -1,7 +1,6 @@
 package proto
 
 import "fmt"
-import "strings"
 
 // Option is a protoc compiler option
 type Option struct {
@@ -45,9 +44,6 @@ func (o *Option) columns() (cols []aligned) {
 func (o *Option) keyValuePair(embedded bool) (cols []aligned) {
 	equals := alignedEquals
 	name := o.Name
-	if strings.Contains(name, ".") {
-		name = fmt.Sprintf("(%s)", name)
-	}
 	if embedded {
 		return append(cols, notAligned(name), equals, rightAligned(o.Constant.String()))
 	}
@@ -65,11 +61,11 @@ func (o *Option) parse(p *Parser) error {
 				return p.unexpected(lit, "option full identifier", o)
 			}
 		}
-		o.Name = lit
 		tok, _ = p.scanIgnoreWhitespace()
 		if tok != tRIGHTPAREN {
 			return p.unexpected(lit, "full identifier closing )", o)
 		}
+		o.Name = fmt.Sprintf("(%s)", lit)
 	} else {
 		// non full ident
 		if tIDENT != tok {

option_test.go

@@ -9,8 +9,8 @@ func TestOption(t *testing.T) {
 		strLit    string
 		nonStrLit string
 	}{{
-		`option (full.java_package) = "com.example.foo";`,
-		"full.java_package",
+		`option (full).java_package = "com.example.foo";`,
+		"(full).java_package",
 		"com.example.foo",
 		"",
 	}, {