[XamlC] support nested types type declarations (#872)

2 files changed, 15 insertions, 0 deletions

diff --git a/Xamarin.Forms.Xaml.UnitTests/XStatic.xaml b/Xamarin.Forms.Xaml.UnitTests/XStatic.xaml
index 2627ae39..35f0f04d 100644
--- a/Xamarin.Forms.Xaml.UnitTests/XStatic.xaml
+++ b/Xamarin.Forms.Xaml.UnitTests/XStatic.xaml
@@ -24,5 +24,7 @@
 				Orientation="{x:Static ScrollOrientation.Both}"/>
 		<Label x:Name="field2"
 				Text="{x:Static local:MockxStatic.MockFieldRef}" />
+		<Label x:Name="nestedField"
+				Text="{x:Static local:MockxStatic+Nested.Foo}" />
 	</StackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/Xamarin.Forms.Xaml.UnitTests/XStatic.xaml.cs b/Xamarin.Forms.Xaml.UnitTests/XStatic.xaml.cs
index 63854e1c..a545b4a5 100644
--- a/Xamarin.Forms.Xaml.UnitTests/XStatic.xaml.cs
+++ b/Xamarin.Forms.Xaml.UnitTests/XStatic.xaml.cs
@@ -17,6 +17,10 @@ namespace Xamarin.Forms.Xaml.UnitTests
 		public static string MockFieldRef = Icons.CLOSE;
 		public string InstanceProperty { get { return "InstanceProperty"; } }
 		public static readonly Color BackgroundColor = Color.Fuchsia;
+
+		public class Nested {
+			public static string Foo = "FOO";
+		}
 	}
 
 	public enum MockEnum : long
@@ -135,6 +139,15 @@ namespace Xamarin.Forms.Xaml.UnitTests
 				var layout = new XStatic(useCompiledXaml);
 				Assert.AreEqual("ic_close.png", layout.ToolbarItems[0].Icon.File);
 			}
+
+			[TestCase(false)]
+			[TestCase(true)]
+			// https://bugzilla.xamarin.com/show_bug.cgi?id=55096
+			public void xStaticAndNestedClasses(bool useCompiledXaml)
+			{
+				var layout = new XStatic(useCompiledXaml);
+				Assert.AreEqual(MockxStatic.Nested.Foo, layout.nestedField.Text);
+			}
 		}
 	}
 }
\ No newline at end of file