From d01e19e3f43e71c21e02642bc551e7a562d20b7b Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Tue, 12 Dec 2017 22:05:36 +0100 Subject: [PATCH 1/2] Added failing test for #1275. --- .../Xaml/BasicTests.cs | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs index ffd666fe12..fb432c30d4 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs @@ -868,6 +868,25 @@ do we need it?")] } } + [Fact] + public void Element_Whitespace_Should_Be_Trimmed() + { + using (UnitTestApplication.Start(TestServices.MockWindowingPlatform)) + { + var xaml = @" + + + Hello World! + +"; + + var window = AvaloniaXamlLoader.Parse(xaml); + var textBlock = (TextBlock)window.Content; + + Assert.Equal("Hello World!", textBlock.Text); + } + } + private class SelectedItemsViewModel : INotifyPropertyChanged { public string[] Items { get; set; } From 05da271376bbe8b0c0a3a5f6e8ad8cf6895914b0 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Tue, 12 Dec 2017 22:21:39 +0100 Subject: [PATCH 2/2] Updated Portable.Xaml Merged `fixes/76-trim-whitespace` into `avalonia` branch (https://github.com/cwensley/Portable.Xaml/pull/77). Fixes whitespace trimming in Xaml reader. Fixes #1275 --- .../Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github index d50ae8335e..c066401445 160000 --- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github +++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github @@ -1 +1 @@ -Subproject commit d50ae8335eb50d4b9606de6f5fa1cbbc78bfd72f +Subproject commit c0664014455392ac221a765e66f9837704339b6f