Modernized accessor syntax in several places (#13044)

* Modernized accessor syntax in several places

* Toned down the getter modernization

* Block body for properties with code

---------

Co-authored-by: Lehonti Ramos <lehonti@ramos>

tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs

@@ -699,10 +699,10 @@ namespace Avalonia.Markup.UnitTests.Data
 
             public double DoubleValue
             {
-                get { return GetValue(DoubleValueProperty); }
+                get => GetValue(DoubleValueProperty);
-                set { SetValue(DoubleValueProperty, value); }
+                set => SetValue(DoubleValueProperty, value);
             }
-            
+
             public static StyledProperty<double?> NullableDoubleProperty = 
                 AvaloniaProperty.Register<StyledPropertyClass, double?>(nameof(NullableDoubleProperty), -1);
 
@@ -724,8 +724,8 @@ namespace Avalonia.Markup.UnitTests.Data
             private double _doubleValue;
             public double DoubleValue
             {
-                get { return _doubleValue; }
+                get => _doubleValue;
-                set { SetAndRaise(DoubleValueProperty, ref _doubleValue, value); }
+                set => SetAndRaise(DoubleValueProperty, ref _doubleValue, value);
             }
         }
 
@@ -756,7 +756,7 @@ namespace Avalonia.Markup.UnitTests.Data
 
             public double Value
             {
-                get { return _value; }
+                get => _value;
                 set
                 {
                     if (_value != value)
@@ -788,8 +788,8 @@ namespace Avalonia.Markup.UnitTests.Data
 
             public string TwoWay
             {
-                get { return GetValue(TwoWayProperty); }
+                get => GetValue(TwoWayProperty);
-                set { SetValue(TwoWayProperty, value); }
+                set => SetValue(TwoWayProperty, value);
             }
         }
 
@@ -800,7 +800,7 @@ namespace Avalonia.Markup.UnitTests.Data
 
             public string Foo
             {
-                get { return _foo; }
+                get => _foo;
                 set
                 {
                     _foo = value;
@@ -911,8 +911,8 @@ namespace Avalonia.Markup.UnitTests.Data
 
             public int Baz
             {
-                get { return GetValue(BazProperty); }
+                get => GetValue(BazProperty);
-                set { SetValue(BazProperty, value); }
+                set => SetValue(BazProperty, value);
             }
         }
     }

tests/Avalonia.Markup.UnitTests/Data/BindingTests_Source.cs

@@ -28,7 +28,7 @@ namespace Avalonia.Markup.UnitTests.Data
 
             public string Foo
             {
-                get { return _foo; }
+                get => _foo;
                 set
                 {
                     _foo = value;

tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_AttachedProperty.cs

@@ -158,8 +158,8 @@ namespace Avalonia.Markup.UnitTests.Parsers
 
             public Class1 Next
             {
-                get { return GetValue(NextProperty); }
+                get => GetValue(NextProperty);
-                set { SetValue(NextProperty, value); }
+                set => SetValue(NextProperty, value);
             }
         }
     }

tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Indexer.cs

@@ -369,10 +369,7 @@ namespace Avalonia.Markup.UnitTests.Parsers
 
             public string this[string key]
             {
-                get
+                get => _storage[key];
-                {
-                    return _storage[key];
-                }
                 set
                 {
                     _storage[key] = value;

tests/Avalonia.Markup.Xaml.UnitTests/Converters/AvaloniaPropertyConverterTest.cs

@@ -115,9 +115,9 @@ namespace Avalonia.Markup.Xaml.UnitTests.Converters
             public static readonly StyledProperty<string> FooProperty =
                 AvaloniaProperty.Register<Class1, string>("Foo");
 
-            public ThemeVariant ThemeVariant 
+            public ThemeVariant ThemeVariant
             {
-                get { throw new NotImplementedException(); }
+                get => throw new NotImplementedException();
             }
 
             public event EventHandler ThemeVariantChanged;

tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs

@@ -231,10 +231,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
             object _parameter;
             public object Parameter
             {
-                get
+                get => _parameter;
-                {
-                    return _parameter;
-                }
                 set
                 {
                     if (_parameter == value)

tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs

@@ -1949,10 +1949,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
 
             public string this[string key]
             {
-                get
+                get => _storage[key];
-                {
-                    return _storage[key];
-                }
                 set
                 {
                     _storage[key] = value;
@@ -1991,10 +1988,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
         object _parameter;
         public object Parameter
         {
-            get
+            get => _parameter;
-            {
-                return _parameter;
-            }
             set
             {
                 if (_parameter == value)
@@ -2050,8 +2044,8 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
         private IEnumerable _items;
         public IEnumerable Items
         {
-            get { return _items; }
+            get => _items;
-            set { SetAndRaise(ItemsProperty, ref _items, value); }
+            set => SetAndRaise(ItemsProperty, ref _items, value);
         }
 
         public AvaloniaList<DataGridLikeColumn> Columns { get; } = new();

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

@@ -12,14 +12,14 @@ namespace Avalonia.Markup.Xaml.UnitTests
 
         public int Int
         {
-            get { return GetValue(IntProperty); }
+            get => GetValue(IntProperty);
-            set { SetValue(IntProperty, value); }
+            set => SetValue(IntProperty, value);
         }
 
         public string String
         {
-            get { return GetValue(StringProperty); }
+            get => GetValue(StringProperty);
-            set { SetValue(StringProperty, value); }
+            set => SetValue(StringProperty, value);
         }
     }
-}
+}

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

@@ -10,7 +10,7 @@ namespace Avalonia.Markup.Xaml.UnitTests
 
         public int Integer
         {
-            get { return _integer; }
+            get => _integer;
             set
             {
                 _integer = value;
@@ -20,7 +20,7 @@ namespace Avalonia.Markup.Xaml.UnitTests
 
         public string String
         {
-            get { return _string; }
+            get => _string;
             set
             {
                 _string = value;
@@ -30,7 +30,7 @@ namespace Avalonia.Markup.Xaml.UnitTests
 
         public TestViewModel Child
         {
-            get { return _child; }
+            get => _child;
             set
             {
                 _child = value;

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

@@ -990,7 +990,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
 
             public IList SelectedItems
             {
-                get { return _selectedItems; }
+                get => _selectedItems;
                 set
                 {
                     _selectedItems = value;

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

@@ -20,19 +20,16 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
 
         public Control Control
         {
-            get { return GetValue(ControlProperty); }
+            get => GetValue(ControlProperty);
-            set { SetValue(ControlProperty, value); }
+            set => SetValue(ControlProperty, value);
         }
 
         public string String
         {
-            get { return GetValue(StringProperty); }
+            get => GetValue(StringProperty);
-            set { SetValue(StringProperty, value); }
+            set => SetValue(StringProperty, value);
         }
 
-        public string Bar
+        public string Bar => GetValue(BarProperty);
-        {
-            get { return GetValue(BarProperty); }
-        }
     }
 }

tests/Avalonia.ReactiveUI.UnitTests/AvaloniaObjectTests_GetSubject.cs

@@ -37,8 +37,8 @@ namespace Avalonia.ReactiveUI.UnitTests
 
             public string Foo
             {
-                get { return GetValue(FooProperty); }
+                get => GetValue(FooProperty);
-                set { SetValue(FooProperty, value); }
+                set => SetValue(FooProperty, value);
             }
         }
     }

tests/Avalonia.RenderTests/Media/ImageBrushTests.cs

@@ -21,12 +21,18 @@ namespace Avalonia.Direct2D1.RenderTests.Media
 
         private string BitmapPath
         {
-            get { return System.IO.Path.Combine(OutputPath, "github_icon.png"); }
+            get
+            {
+                return System.IO.Path.Combine(OutputPath, "github_icon.png");
+            }
         }
 
         private string SmallBitmapPath
         {
-            get { return System.IO.Path.Combine(OutputPath, "github_icon_small.png"); }
+            get
+            {
+                return System.IO.Path.Combine(OutputPath, "github_icon_small.png");
+            }
         }
 
         [Fact]

tests/Avalonia.RenderTests/Media/ImageDrawingTests.cs

@@ -19,7 +19,10 @@ namespace Avalonia.Direct2D1.RenderTests.Media
 
         private string BitmapPath
         {
-            get { return System.IO.Path.Combine(OutputPath, "github_icon.png"); }
+            get
+            {
+                return System.IO.Path.Combine(OutputPath, "github_icon.png");
+            }
         }
 
         [Fact]

tests/Avalonia.RenderTests/Media/VisualBrushTests.cs

@@ -21,7 +21,10 @@ namespace Avalonia.Direct2D1.RenderTests.Media
 
         private string BitmapPath
         {
-            get { return System.IO.Path.Combine(OutputPath, "github_icon.png"); }
+            get
+            {
+                return System.IO.Path.Combine(OutputPath, "github_icon.png");
+            }
         }
 
         private Control Visual