Visit field types of messages even if a type should not be generated (#…

…336)

Signed-off-by: Miguel Molina <[email protected]>

protoc-gen-gogo/generator/generator.go

@@ -2210,6 +2210,15 @@ func (g *Generator) generateMessage(message *Descriptor) {
 		}
 		g.Out()
 		g.P("}")
+	} else {
+		// Even if the type does not need to be generated, we need to iterate
+		// over all its fields to be able to mark as used any imported types
+		// used by those fields.
+		for _, field := range message.Field {
+			if !gogoproto.IsStdTime(field) && !gogoproto.IsStdDuration(field) {
+				g.RecordTypeUse(field.GetTypeName())
+			}
+		}
 	}
 
 	// Update g.Buffer to list valid oneof types.

test/typedeclimport/Makefile

@@ -0,0 +1,4 @@
+regenerate:
+	go install github.com/gogo/protobuf/protoc-gen-gogo
+	protoc-min-version --version="3.0.0" --gogo_out=. --proto_path=../../../../../:../../protobuf/:. typedeclimport.proto
+	protoc-min-version --version="3.0.0" --gogo_out=. --proto_path=../../../../../:../../protobuf/:. ./subpkg/subpkg.proto

test/typedeclimport/models.go

@@ -0,0 +1,7 @@
+package typedeclimport
+
+import subpkg "github.com/gogo/protobuf/test/typedeclimport/subpkg"
+
+type SomeMessage struct {
+	Imported subpkg.AnotherMessage
+}