Merge pull request #31 from TheThingsIndustries/fix/oneof-setfields

Fix nested oneof fields code generation

main_test.go

@@ -202,6 +202,26 @@ func TestFieldMaskPaths(t *testing.T) {
 		"testOneof.d",
 		"testOneof.e",
 		"testOneof.f",
+		"testOneof.k",
+		"testOneof.k.a",
+		"testOneof.k.a.a",
+		"testOneof.k.a.b",
+		"testOneof.k.a.c",
+		"testOneof.k.a.d",
+		"testOneof.k.a.h",
+		"testOneof.k.a.h.nested_field",
+		"testOneof.k.a.i",
+		"testOneof.k.a.i.nested_field_2",
+		"testOneof.k.a.testNestedNestedOneOf",
+		"testOneof.k.a.testNestedNestedOneOf.e",
+		"testOneof.k.a.testNestedNestedOneOf.f",
+		"testOneof.k.a.testNestedNestedOneOf.g",
+		"testOneof.k.b",
+		"testOneof.k.c",
+		"testOneof.k.d",
+		"testOneof.k.e",
+		"testOneof.k.f",
+		"testOneof.k.g",
 	})
 	a.So(testdata.TestFieldPathsTopLevel, should.Resemble, []string{
 		"a",
@@ -391,6 +411,29 @@ func TestSetFields(t *testing.T) {
 				G:         &testdata.Empty{},
 			},
 		},
+		{
+			Name:        "testOneof.k.a.a",
+			Destination: &testdata.Test{},
+			Source: &testdata.Test{
+				TestOneof: &testdata.Test_K{
+					K: &testdata.Test_TestNested{
+						A: &testdata.Test_TestNested_TestNestedNested{
+							A: 42,
+						},
+					},
+				},
+			},
+			Paths: []string{"testOneof.k.a.a"},
+			Result: &testdata.Test{
+				TestOneof: &testdata.Test_K{
+					K: &testdata.Test_TestNested{
+						A: &testdata.Test_TestNested_TestNestedNested{
+							A: 42,
+						},
+					},
+				},
+			},
+		},
 		{
 			Name: "testOneof.e",
 			Destination: &testdata.Test{

module/setter.go

@@ -141,10 +141,10 @@ func (m *setterModule) buildSetFieldsCase(buf *strings.Builder, imports importMa
 		))
 	}
 
-	buildIndented(buf, tabCount+1, `	if err := newDst.SetFields(newSrc, subs...); err != nil {
+	buildIndented(buf, tabCount+1, fmt.Sprintf(`	if err := newDst.SetFields(newSrc, %s...); err != nil {
 		return err
 	}
-} else {`)
+} else {`, subs))
 	if err := buildFinal(tabCount + 2); err != nil {
 		return err
 	}

testdata/testdata.proto

@@ -65,6 +65,7 @@ message Test {
     int32 d = 4;
     uint32 e = 5 [(gogoproto.customname) = "CustomNameOneof"];
     bytes f = 6;
+    TestNested k = 10;
   }
   Empty g = 7;
   google.protobuf.StringValue h = 8;