Merge branch 'master' into GeometryConverer

samples/ControlCatalog/Models/StateData.cs

@@ -6,10 +6,10 @@ public class StateData
     public string Abbreviation { get; private set; }
     public string Capital { get; private set; }
 
-    public StateData(string name, string abbreviatoin, string capital)
+    public StateData(string name, string abbreviation, string capital)
     {
         Name = name;
-        Abbreviation = abbreviatoin;
+        Abbreviation = abbreviation;
         Capital = capital;
     }
 
@@ -17,4 +17,4 @@ public class StateData
     {
         return Name;
     }
-}
+}

src/Avalonia.FreeDesktop/DBusMenuExporter.cs

@@ -25,9 +25,9 @@ namespace Avalonia.FreeDesktop
             return new DBusMenuExporterImpl(DBusHelper.Connection, xid);
         }
         
-        public static INativeMenuExporter TryCreateDetachedNativeMenu(ObjectPath path, Connection currentConection)
+        public static INativeMenuExporter TryCreateDetachedNativeMenu(ObjectPath path, Connection currentConnection)
         {
-            return new DBusMenuExporterImpl(currentConection, path);
+            return new DBusMenuExporterImpl(currentConnection, path);
         }
 
         public static ObjectPath GenerateDBusMenuObjPath => "/net/avaloniaui/dbusmenu/"

src/Browser/Avalonia.Browser/Storage/BrowserStorageProvider.cs

@@ -29,11 +29,11 @@ internal class BrowserStorageProvider : IStorageProvider
         await _lazyModule.Value;
         var startIn = (options.SuggestedStartLocation as JSStorageItem)?.FileHandle;
 
-        var (types, exludeAll) = ConvertFileTypes(options.FileTypeFilter);
+        var (types, excludeAll) = ConvertFileTypes(options.FileTypeFilter);
 
         try
         {
-            using var items = await StorageHelper.OpenFileDialog(startIn, options.AllowMultiple, types, exludeAll);
+            using var items = await StorageHelper.OpenFileDialog(startIn, options.AllowMultiple, types, excludeAll);
             if (items is null)
             {
                 return Array.Empty<IStorageFile>();
@@ -63,11 +63,11 @@ internal class BrowserStorageProvider : IStorageProvider
         await _lazyModule.Value;
         var startIn = (options.SuggestedStartLocation as JSStorageItem)?.FileHandle;
 
-        var (types, exludeAll) = ConvertFileTypes(options.FileTypeChoices);
+        var (types, excludeAll) = ConvertFileTypes(options.FileTypeChoices);
 
         try
         {
-            var item = await StorageHelper.SaveFileDialog(startIn, options.SuggestedFileName, types, exludeAll);
+            var item = await StorageHelper.SaveFileDialog(startIn, options.SuggestedFileName, types, excludeAll);
             return item is not null ? new JSStorageFile(item) : null;
         }
         catch (JSException ex) when (ex.Message.Contains(PickerCancelMessage, StringComparison.Ordinal))
@@ -127,9 +127,9 @@ internal class BrowserStorageProvider : IStorageProvider
             types = null;
         }
 
-        var inlcudeAll = input?.Contains(FilePickerFileTypes.All) == true || types is null;
+        var includeAll = input?.Contains(FilePickerFileTypes.All) == true || types is null;
 
-        return (types, !inlcudeAll);
+        return (types, !includeAll);
     }
 }
 

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

@@ -124,7 +124,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                                             $"Cannot convert '{attachedProperty.Value}' to '{targetPropertyType.GetFqn()}",
                                             node);
 
-                                result = new XamlIlAttacchedPropertyEqualsSelector(result, targetPropertyField, typedValue);
+                                result = new XamlIlAttachedPropertyEqualsSelector(result, targetPropertyField, typedValue);
                                 break;
                             }
                         case SelectorGrammar.ChildSyntax child:
@@ -414,9 +414,9 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
     }
 
 
-    class XamlIlAttacchedPropertyEqualsSelector : XamlIlSelectorNode
+    class XamlIlAttachedPropertyEqualsSelector : XamlIlSelectorNode
     {
-        public XamlIlAttacchedPropertyEqualsSelector(XamlIlSelectorNode previous,
+        public XamlIlAttachedPropertyEqualsSelector(XamlIlSelectorNode previous,
             IXamlField propertyFiled,
             IXamlAstValueNode value)
             : base(previous)

src/iOS/Avalonia.iOS/Storage/IOSStorageProvider.cs

@@ -34,7 +34,7 @@ internal class IOSStorageProvider : IStorageProvider
         UIDocumentPickerViewController documentPicker;
         if (OperatingSystem.IsIOSVersionAtLeast(14))
         {
-            var allowedUtis = options.FileTypeFilter?.SelectMany(f =>
+            var allowedUtils = options.FileTypeFilter?.SelectMany(f =>
                 {
                     // We check for OS version outside of the lambda, it's safe.
 #pragma warning disable CA1416
@@ -56,18 +56,18 @@ internal class IOSStorageProvider : IStorageProvider
                 UTTypes.Item,
                 UTTypes.Data
             };
-            documentPicker = new UIDocumentPickerViewController(allowedUtis!, false);
+            documentPicker = new UIDocumentPickerViewController(allowedUtils!, false);
         }
         else
         {
-            var allowedUtis = options.FileTypeFilter?.SelectMany(f => f.AppleUniformTypeIdentifiers ?? Array.Empty<string>())
+            var allowedUtils = options.FileTypeFilter?.SelectMany(f => f.AppleUniformTypeIdentifiers ?? Array.Empty<string>())
                 .ToArray() ?? new[]
             {
                 UTTypeLegacy.Content,
                 UTTypeLegacy.Item,
                 "public.data"
             };
-            documentPicker = new UIDocumentPickerViewController(allowedUtis, UIDocumentPickerMode.Open);
+            documentPicker = new UIDocumentPickerViewController(allowedUtils, UIDocumentPickerMode.Open);
         }
 
         using (documentPicker)

tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_SetValue.cs

@@ -227,7 +227,7 @@ namespace Avalonia.Base.UnitTests
         {
             Class2 target = new Class2();
 
-            target.SetValue((AvaloniaProperty)Class2.FlobProperty, new ImplictDouble(4));
+            target.SetValue((AvaloniaProperty)Class2.FlobProperty, new ImplicitDouble(4));
 
             var value = target.GetValue(Class2.FlobProperty);
             Assert.IsType<double>(value);
@@ -393,16 +393,16 @@ namespace Avalonia.Base.UnitTests
                 AvaloniaProperty.RegisterAttached<AttachedOwner, Class2, string>("Attached");
         }
 
-        private class ImplictDouble
+        private class ImplicitDouble
         {
-            public ImplictDouble(double value)
+            public ImplicitDouble(double value)
             {
                 Value = value;
             }
 
             public double Value { get; }
 
-            public static implicit operator double (ImplictDouble v)
+            public static implicit operator double (ImplicitDouble v)
             {
                 return v.Value;
             }

tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_DataValidation.cs

@@ -49,7 +49,7 @@ namespace Avalonia.Base.UnitTests.Data.Core
         ////}
 
         [Fact]
-        public void Indei_Validation_Does_Not_Subscribe_When_DataValidatation_Not_Enabled()
+        public void Indei_Validation_Does_Not_Subscribe_When_DataValidation_Not_Enabled()
         {
             var data = new IndeiTest { MustBePositive = 5 };
             var observer = ExpressionObserver.Create(data, o => o.MustBePositive, false);

tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_ExpressionTree.cs

@@ -42,7 +42,7 @@ namespace Avalonia.Base.UnitTests.Data.Core
         }
 
         [Fact]
-        public void Property_Acccess_Expression_Can_Set_Property()
+        public void Property_Access_Expression_Can_Set_Property()
         {
             var data = new Class1();
             var target = ExpressionObserver.Create(data, o => o.Foo);

tests/Avalonia.Base.UnitTests/Input/GesturesTests.cs

@@ -506,7 +506,7 @@ namespace Avalonia.Base.UnitTests.Input
         }
 
         [Fact]
-        public void Scrolling_Should_Start_After_Start_Distance_Is_Exceded()
+        public void Scrolling_Should_Start_After_Start_Distance_Is_Exceeded()
         {
             Border border = new Border()
             {

tests/Avalonia.Base.UnitTests/VisualTests.cs

@@ -126,7 +126,7 @@ namespace Avalonia.Base.UnitTests
         }
 
         [Fact]
-        public void Root_Should_Retun_Self_As_VisualRoot()
+        public void Root_Should_Return_Self_As_VisualRoot()
         {
             var root = new TestRoot();
 
@@ -134,7 +134,7 @@ namespace Avalonia.Base.UnitTests
         }
 
         [Fact]
-        public void Descendants_Should_RetunVisualRoot()
+        public void Descendants_Should_ReturnVisualRoot()
         {
             var root = new TestRoot();
             var child1 = new Decorator();

tests/Avalonia.Controls.UnitTests/WindowTests.cs

@@ -140,7 +140,7 @@ namespace Avalonia.Controls.UnitTests
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
-        public void Child_windows_should_be_closed_before_parent(bool programaticClose)
+        public void Child_windows_should_be_closed_before_parent(bool programmaticClose)
         {
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
@@ -156,7 +156,7 @@ namespace Avalonia.Controls.UnitTests
                 window.Closing += (sender, e) =>
                 {
                     Assert.Equal(WindowCloseReason.WindowClosing, e.CloseReason);
-                    Assert.Equal(programaticClose, e.IsProgrammatic);
+                    Assert.Equal(programmaticClose, e.IsProgrammatic);
                     count++;
                     windowClosing = count;
                 };
@@ -164,7 +164,7 @@ namespace Avalonia.Controls.UnitTests
                 child.Closing += (sender, e) =>
                 {
                     Assert.Equal(WindowCloseReason.OwnerWindowClosing, e.CloseReason);
-                    Assert.Equal(programaticClose, e.IsProgrammatic);
+                    Assert.Equal(programmaticClose, e.IsProgrammatic);
                     count++;
                     childClosing = count;
                 };
@@ -184,7 +184,7 @@ namespace Avalonia.Controls.UnitTests
                 window.Show();
                 child.Show(window);
 
-                if (programaticClose)
+                if (programmaticClose)
                 {
                     window.Close();
                 }
@@ -205,7 +205,7 @@ namespace Avalonia.Controls.UnitTests
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
-        public void Child_windows_must_not_close_before_parent_has_chance_to_Cancel_OSCloseButton(bool programaticClose)
+        public void Child_windows_must_not_close_before_parent_has_chance_to_Cancel_OSCloseButton(bool programmaticClose)
         {
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
@@ -246,7 +246,7 @@ namespace Avalonia.Controls.UnitTests
                 window.Show();
                 child.Show(window);
                 
-                if (programaticClose)
+                if (programmaticClose)
                 {
                     window.Close();
                 }

tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs

@@ -59,7 +59,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         }
 
         [Fact]
-        public void Attached_Property_Is_Set_On_Control_Outside_Avalonia_Namspace()
+        public void Attached_Property_Is_Set_On_Control_Outside_Avalonia_Namespace()
         {
             // Test for issue #1548
             var xaml =
@@ -729,7 +729,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         }
 
         [Fact]
-        public void DeferedXamlLoader_Should_Preserve_NamespacesContext()
+        public void DeferredXamlLoader_Should_Preserve_NamespacesContext()
         {
             var xaml =
 @"<ContentControl xmlns='https://github.com/avaloniaui'

tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlTemplateTests.cs

@@ -27,11 +27,11 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
     <Button>
         <Button.Template>
             <ControlTemplate>
-                <controls:ListBoxHierachyLine>
-                    <controls:ListBoxHierachyLine.LineDashStyle>
+                <controls:ListBoxHierarchyLine>
+                    <controls:ListBoxHierarchyLine.LineDashStyle>
                         <DashStyle Dashes=""2,2"" Offset=""1"" />
-                    </controls:ListBoxHierachyLine.LineDashStyle>
-                </controls:ListBoxHierachyLine>
+                    </controls:ListBoxHierarchyLine.LineDashStyle>
+                </controls:ListBoxHierarchyLine>
             </ControlTemplate>
         </Button.Template>
     </Button>
@@ -41,7 +41,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
 
                 window.ApplyTemplate();
                 button.ApplyTemplate();
-                var listBoxHierarchyLine = button.GetVisualChildren().ElementAt(0) as ListBoxHierachyLine;
+                var listBoxHierarchyLine = button.GetVisualChildren().ElementAt(0) as ListBoxHierarchyLine;
                 Assert.Equal(1, listBoxHierarchyLine.LineDashStyle.Offset);
                 Assert.Equal(2, listBoxHierarchyLine.LineDashStyle.Dashes.Count);
                 Assert.Equal(2, listBoxHierarchyLine.LineDashStyle.Dashes[0]);
@@ -309,10 +309,10 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             Assert.Equal("Bar", bar.Name);
         }
     }
-    public class ListBoxHierachyLine : Panel
+    public class ListBoxHierarchyLine : Panel
     {
         public static readonly StyledProperty<DashStyle> LineDashStyleProperty =
-        AvaloniaProperty.Register<ListBoxHierachyLine, DashStyle>(nameof(LineDashStyle));
+        AvaloniaProperty.Register<ListBoxHierarchyLine, DashStyle>(nameof(LineDashStyle));
 
         public DashStyle LineDashStyle
         {

tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs

@@ -272,7 +272,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         }
 
         [Fact]
-        public void Style_Can_Use_NthChild_Selector_After_Reoder()
+        public void Style_Can_Use_NthChild_Selector_After_Reorder()
         {
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
@@ -311,7 +311,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         }
 
         [Fact]
-        public void Style_Can_Use_NthLastChild_Selector_After_Reoder()
+        public void Style_Can_Use_NthLastChild_Selector_After_Reorder()
         {
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {

tests/Avalonia.RenderTests/Controls/TextBlockTests.cs

@@ -45,7 +45,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
         [Win32Fact("Has text")]
         public async Task RestrictedHeight_VerticalAlign()
         {
-            Control text(VerticalAlignment verticalAlingnment, bool clip = true, bool restrictHeight = true)
+            Control text(VerticalAlignment verticalAlignment, bool clip = true, bool restrictHeight = true)
             {
                 return new Border()
                 {
@@ -62,7 +62,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                         FontSize = 24,
                         Foreground = Brushes.Black,
                         Text = "L",
-                        VerticalAlignment = verticalAlingnment,
+                        VerticalAlignment = verticalAlignment,
                         ClipToBounds = clip
                     }
                 };

tests/Avalonia.RenderTests/Media/TextFormatting/TextLayoutTests.cs

@@ -186,7 +186,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
         [InlineData("x", 0, 200, 200 - 7.20, 0, 7.20, FontSizeHeight)]
         [InlineData(stringword, 0, 200, 171.20, 0, 7.20, FontSizeHeight)]
         [InlineData(stringword, 3, 200, 200 - 7.20, 0, 7.20, FontSizeHeight)]
-        public void Should_HitTestPosition_RigthAlign_Correctly(
+        public void Should_HitTestPosition_RightAlign_Correctly(
                                                     string input, int index, double widthConstraint,
                                                     double x, double y, double width, double height)
         {

tests/Avalonia.RenderTests/OpacityMaskTests.cs

@@ -57,7 +57,7 @@ namespace Avalonia.Direct2D1.RenderTests
         }
 
         [Fact]
-        public async Task RenderTansform_Applies_To_Opacity_Mask()
+        public async Task RenderTransform_Applies_To_Opacity_Mask()
         {
             var target = new Canvas
             {