Update @cpp.DeprecatedTerseWrite codemod to ignore fields in Union

Summary: union fields are not eligibile for deprecated_terse_write

Reviewed By: pranavtbhat

Differential Revision: D68795539

fbshipit-source-id: adbf94d1563454b2e987e1580572102bc7e9e717

Author: thedavekwon

thrift/compiler/codemod/annotate_deprecated_terse_writes_fields.cc

@@ -61,8 +61,13 @@ class AnnonateDeprecatedTerseWriteFields final {
     bool any_annotated = false;
 
     const_ast_visitor visitor;
-    visitor.add_field_visitor([&](const t_field& field) {
-      any_annotated |= maybe_annotate_field(field);
+    visitor.add_structured_definition_visitor([&](const t_structured& strct) {
+      if (strct.is_union()) {
+        return;
+      }
+      for (const t_field& field : strct.fields()) {
+        any_annotated |= maybe_annotate_field(field);
+      }
     });
     visitor(program_);
 

thrift/compiler/codemod/annotate_deprecated_terse_writes_fields_test.py

@@ -56,12 +56,23 @@ def test_basic_replace(self):
                     7: MyStruct g (cpp.ref_type = "shared");
                 }
 
+                union NoOpFieldsUnion {
+                    1: i32 a;
+                }
+
                 struct ShouldAnnotateFields {
                     1: string a;
                     2: string b (cpp.ref = "true");
                     3: MyStruct c (cpp.ref = "true");
                     4: string d (cpp.ref_type = "shared");
                 }
+
+                exception ShouldAnnotateFieldsException {
+                    1: string a;
+                    2: string b (cpp.ref = "true");
+                    3: MyStruct c (cpp.ref = "true");
+                    4: string d (cpp.ref_type = "shared");
+                }
                 """
             ),
         )
@@ -92,6 +103,10 @@ def test_basic_replace(self):
                     7: MyStruct g (cpp.ref_type = "shared");
                 }
 
+                union NoOpFieldsUnion {
+                    1: i32 a;
+                }
+
                 struct ShouldAnnotateFields {
                     @cpp.DeprecatedTerseWrite
                     1: string a;
@@ -102,6 +117,17 @@ def test_basic_replace(self):
                     @cpp.DeprecatedTerseWrite
                     4: string d (cpp.ref_type = "shared");
                 }
+
+                exception ShouldAnnotateFieldsException {
+                    @cpp.DeprecatedTerseWrite
+                    1: string a;
+                    @cpp.DeprecatedTerseWrite
+                    2: string b (cpp.ref = "true");
+                    @cpp.DeprecatedTerseWrite
+                    3: MyStruct c (cpp.ref = "true");
+                    @cpp.DeprecatedTerseWrite
+                    4: string d (cpp.ref_type = "shared");
+                }
                 """
             ),
         )