Merge branch 'AvaloniaUI:master' into master

src/Avalonia.Controls/Notifications/ReversibleStackPanel.cs

@@ -24,6 +24,11 @@ namespace Avalonia.Controls
             set => SetValue(ReverseOrderProperty, value);
         }
 
+        static ReversibleStackPanel()
+        {
+            AffectsArrange<ReversibleStackPanel>(ReverseOrderProperty);
+        }
+
         /// <inheritdoc/>
         protected override Size ArrangeOverride(Size finalSize)
         {

src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlQueryTransformer.cs

@@ -98,7 +98,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             }
             catch (Exception e)
             {
-                throw new XamlParseException("Unable to parse query: " + e.Message, node);
+                throw new XamlParseException("Unable to parse query: " + e, node);
             }
 
             var query = Create(parsed);

src/Markup/Avalonia.Markup/Markup/Parsers/ContainerQueryGrammar.cs

@@ -84,7 +84,7 @@ namespace Avalonia.Markup.Parsers
             if (identifier.SequenceEqual(MinWidthKeyword.AsSpan()) || identifier.SequenceEqual(MaxWidthKeyword.AsSpan()) || identifier.SequenceEqual(WidthKeyword.AsSpan()))
             {
                 if (!r.TakeIf(':'))
-                    throw new ExpressionParseException(r.Position, "Expected ':' after 'orientation'.");
+                    throw new ExpressionParseException(r.Position, $"Expected ':' after '{identifier}'.");
                 double val = ParseDecimal(ref r);
 
                 var syntax = new WidthSyntax()
@@ -101,7 +101,7 @@ namespace Avalonia.Markup.Parsers
             if (identifier.SequenceEqual(MinHeightKeyword.AsSpan()) || identifier.SequenceEqual(MaxHeightKeyword.AsSpan()) || identifier.SequenceEqual(HeightKeyword.AsSpan()))
             {
                 if (!r.TakeIf(':'))
-                    throw new ExpressionParseException(r.Position, "Expected ':' after 'orientation'.");
+                    throw new ExpressionParseException(r.Position, $"Expected ':' after '{identifier}'.");
                 double val = ParseDecimal(ref r);
 
                 var syntax = new HeightSyntax()

tests/Avalonia.Controls.UnitTests/ReversibleStackPanelTests.cs

@@ -0,0 +1,48 @@
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Controls.UnitTests
+{
+    public class ReversibleStackPanelTests : ScopedTestBase
+    {
+        [Fact]
+        public void Arranges_In_Reverse_Order()
+        {
+            var target = new ReversibleStackPanel
+            {
+                ReverseOrder = true,
+                Children =
+                {
+                    new Border { Height = 30, Width = 10 },
+                    new Border { Height = 50 },
+                }
+            };
+
+            target.Measure(Size.Infinity);
+            target.Arrange(new Rect(target.DesiredSize));
+
+            Assert.Equal(new Rect(0, 50, 10, 30), target.Children[0].Bounds);
+            Assert.Equal(new Rect(0, 0, 10, 50), target.Children[1].Bounds);
+        }
+
+        [Fact]
+        public void Invalidates_Arrange_On_Reverse_Order_Change()
+        {
+            var target = new ReversibleStackPanel
+            {
+                Children =
+                {
+                    new Border(),
+                    new Border(),
+                }
+            };
+
+            target.Measure(Size.Infinity);
+            target.Arrange(new Rect(target.DesiredSize));
+            target.ReverseOrder = true;
+
+            Assert.True(target.IsMeasureValid);
+            Assert.False(target.IsArrangeValid);
+        }
+    }
+}