Improved struct ordering (#1052)

microsoft · Oct 28, 2021 · bddd2e1 · bddd2e1
1 parent eab5d4b
commit bddd2e1
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/cppwinrt/code_writers.h b/cppwinrt/code_writers.h
@@ -2718,9 +2718,11 @@ struct __declspec(empty_bases) produce_dispatch_to_overridable<T, D, %>
 
         auto depends = [](writer& w, complex_struct const& left, complex_struct const& right)
         {
+            auto right_type = w.write_temp("%", right.type);
+            std::string right_as_ref = std::string("winrt::Windows::Foundation::IReference<") + right_type + ">";
             for (auto&& field : left.fields)
             {
-                if (w.write_temp("%", right.type) == field.second)
+                if (right_type == field.second || right_as_ref == field.second)
                 {
                     return true;
                 }

diff --git a/test/test_component/test_component.idl b/test/test_component/test_component.idl
@@ -189,6 +189,26 @@ namespace test_component
                 Int32 OuterValue;
             };
         }
+
+        // structs can contain nullable types (IReference<>) as well as strings. These are the only non-POD types
+        // Alphabetical sorting of names below is important to validate sort order in generated code. Metadata will
+        // sort to alphabetical order. cppwinrt needs to re-establish dependencies in the IReference types to produce
+        // correct output.
+        struct NullableC
+        {
+            Single a1;
+            Windows.Foundation.IReference<Single> a2;
+        };
+
+        struct NullableB
+        {
+            Windows.Foundation.IReference<NullableC> a1;
+        };
+
+        struct NullableA
+        {
+            Windows.Foundation.IReference<NullableB> a1;
+        };
     }
 
     namespace Parent