fix #427 consistent import naming between the import declaration and …

…the vars in grpc

* consistent import naming between the import declaration and the vars. This is more consistant with golang/protobuf. 

* moved issue427 test to the 'testall' make target to avoid grpc/context dependency

Makefile

@@ -146,6 +146,7 @@ testall:
 	make -C vanity/test test
 	make -C test/registration test
 	make -C conformance test
+	make -C test/issue427 test
 	make tests
 
 bench:

protoc-gen-gogo/grpc/grpc.go

@@ -36,6 +36,7 @@ package grpc
 
 import (
 	"fmt"
+	"path"
 	"strconv"
 	"strings"
 
@@ -128,11 +129,9 @@ func (g *grpc) GenerateImports(file *generator.FileDescriptor) {
 	if len(file.FileDescriptorProto.Service) == 0 {
 		return
 	}
-	imports := generator.NewPluginImports(g.gen)
-	for _, i := range []string{contextPkgPath, grpcPkgPath} {
-		imports.NewImport(i).Use()
-	}
-	imports.GenerateImports(file)
+	g.P("import ", contextPkg, " ", generator.GoImportPath(path.Join(string(g.gen.ImportPrefix), contextPkgPath)))
+	g.P("import ", grpcPkg, " ", generator.GoImportPath(path.Join(string(g.gen.ImportPrefix), grpcPkgPath)))
+	g.P()
 }
 
 // reservedClientName records whether a client name is reserved on the client side.

test/issue427/.gitignore

@@ -0,0 +1,2 @@
+*.pb.go
+*_test.go

test/issue427/Makefile

@@ -0,0 +1,7 @@
+test:
+	go install github.com/gogo/protobuf/protoc-gen-gogo
+	go install github.com/gogo/protobuf/protoc-min-version
+	go get -u golang.org/x/net/context
+	go get -u google.golang.org/grpc
+	protoc-min-version --version="3.0.0" --gogo_out=plugins=grpc:. --proto_path=../../../../../:../../protobuf/:. issue427.proto
+	go test ./...

test/issue427/README.md

@@ -0,0 +1,11 @@
+# The Bug
+
+Inconsistent package name generation between the import:
+
+* import golang_org_x_net_context "golang.org/x/net/context"
+* import google_golang_org_grpc "google.golang.org/grpc"
+
+and the dummy vars:
+
+* var _ context.Context
+* var _ grpc.ClientConn

test/issue427/issue427.proto

@@ -0,0 +1,18 @@
+syntax = "proto3";
+
+package issue427;
+
+import "github.com/gogo/protobuf/gogoproto/gogo.proto";
+
+option (gogoproto.testgen_all)  = true;
+option (gogoproto.populate_all) = true;
+option (gogoproto.sizer_all)    = true;
+option (gogoproto.equal_all)    = true;
+
+message Foo {
+    string foo = 1;
+}
+
+service Bar {
+    rpc GetBar (Foo) returns (Foo);
+}