From d1444b4f7c19b26a0b42b260af36808bbe89a862 Mon Sep 17 00:00:00 2001 From: Lehonti Ramos <17771375+Lehonti@users.noreply.github.com> Date: Fri, 6 Oct 2023 04:54:38 +0200 Subject: [PATCH] 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 --- .../Data/BindingTests.cs | 22 +++++++++---------- .../Data/BindingTests_Source.cs | 2 +- ...onObserverBuilderTests_AttachedProperty.cs | 4 ++-- .../ExpressionObserverBuilderTests_Indexer.cs | 5 +---- .../AvaloniaPropertyConverterTest.cs | 4 ++-- .../Data/BindingTests_Method.cs | 5 +---- .../CompiledBindingExtensionTests.cs | 14 ++++-------- .../SampleAvaloniaObject.cs | 10 ++++----- .../TestViewModel.cs | 6 ++--- .../Xaml/BasicTests.cs | 2 +- .../Xaml/NonControl.cs | 13 +++++------ .../AvaloniaObjectTests_GetSubject.cs | 4 ++-- .../Media/ImageBrushTests.cs | 10 +++++++-- .../Media/ImageDrawingTests.cs | 5 ++++- .../Media/VisualBrushTests.cs | 5 ++++- 15 files changed, 54 insertions(+), 57 deletions(-) diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs index c312a71d44..13ce8e45c0 100644 --- a/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs +++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs @@ -699,10 +699,10 @@ namespace Avalonia.Markup.UnitTests.Data public double DoubleValue { - get { return GetValue(DoubleValueProperty); } - set { SetValue(DoubleValueProperty, value); } + get => GetValue(DoubleValueProperty); + set => SetValue(DoubleValueProperty, value); } - + public static StyledProperty NullableDoubleProperty = AvaloniaProperty.Register(nameof(NullableDoubleProperty), -1); @@ -724,8 +724,8 @@ namespace Avalonia.Markup.UnitTests.Data private double _doubleValue; public double DoubleValue { - get { return _doubleValue; } - set { SetAndRaise(DoubleValueProperty, ref _doubleValue, value); } + get => _doubleValue; + 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); } - set { SetValue(TwoWayProperty, value); } + get => GetValue(TwoWayProperty); + 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); } - set { SetValue(BazProperty, value); } + get => GetValue(BazProperty); + set => SetValue(BazProperty, value); } } } diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Source.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Source.cs index 368c889003..e78fedc439 100644 --- a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Source.cs +++ b/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; diff --git a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_AttachedProperty.cs b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_AttachedProperty.cs index e5e63b24d0..e79cb70910 100644 --- a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_AttachedProperty.cs +++ b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_AttachedProperty.cs @@ -158,8 +158,8 @@ namespace Avalonia.Markup.UnitTests.Parsers public Class1 Next { - get { return GetValue(NextProperty); } - set { SetValue(NextProperty, value); } + get => GetValue(NextProperty); + set => SetValue(NextProperty, value); } } } diff --git a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Indexer.cs b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Indexer.cs index dbf6ef2ce9..abdf7d1e52 100644 --- a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Indexer.cs +++ b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Indexer.cs @@ -369,10 +369,7 @@ namespace Avalonia.Markup.UnitTests.Parsers public string this[string key] { - get - { - return _storage[key]; - } + get => _storage[key]; set { _storage[key] = value; diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/AvaloniaPropertyConverterTest.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/AvaloniaPropertyConverterTest.cs index 52efc62018..da05bf555c 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/AvaloniaPropertyConverterTest.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/AvaloniaPropertyConverterTest.cs @@ -115,9 +115,9 @@ namespace Avalonia.Markup.Xaml.UnitTests.Converters public static readonly StyledProperty FooProperty = AvaloniaProperty.Register("Foo"); - public ThemeVariant ThemeVariant + public ThemeVariant ThemeVariant { - get { throw new NotImplementedException(); } + get => throw new NotImplementedException(); } public event EventHandler ThemeVariantChanged; diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs index 59a17a8cd1..02cb94e6d1 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs +++ b/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 - { - return _parameter; - } + get => _parameter; set { if (_parameter == value) diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs index 673076d46a..c6fd14fdfe 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs @@ -1949,10 +1949,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions public string this[string key] { - get - { - return _storage[key]; - } + get => _storage[key]; set { _storage[key] = value; @@ -1991,10 +1988,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions object _parameter; public object Parameter { - get - { - return _parameter; - } + get => _parameter; set { if (_parameter == value) @@ -2050,8 +2044,8 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions private IEnumerable _items; public IEnumerable Items { - get { return _items; } - set { SetAndRaise(ItemsProperty, ref _items, value); } + get => _items; + set => SetAndRaise(ItemsProperty, ref _items, value); } public AvaloniaList Columns { get; } = new(); diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/SampleAvaloniaObject.cs b/tests/Avalonia.Markup.Xaml.UnitTests/SampleAvaloniaObject.cs index b4c2bda935..7be95044a8 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/SampleAvaloniaObject.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/SampleAvaloniaObject.cs @@ -12,14 +12,14 @@ namespace Avalonia.Markup.Xaml.UnitTests public int Int { - get { return GetValue(IntProperty); } - set { SetValue(IntProperty, value); } + get => GetValue(IntProperty); + set => SetValue(IntProperty, value); } public string String { - get { return GetValue(StringProperty); } - set { SetValue(StringProperty, value); } + get => GetValue(StringProperty); + set => SetValue(StringProperty, value); } } -} \ No newline at end of file +} diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/TestViewModel.cs b/tests/Avalonia.Markup.Xaml.UnitTests/TestViewModel.cs index 93232cd355..18d1944dff 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/TestViewModel.cs +++ b/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; diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs index 70541b6196..5875f2777d 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs +++ b/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; diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/NonControl.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/NonControl.cs index 09fa019634..7e718f5b15 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/NonControl.cs +++ b/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); } - set { SetValue(ControlProperty, value); } + get => GetValue(ControlProperty); + set => SetValue(ControlProperty, value); } public string String { - get { return GetValue(StringProperty); } - set { SetValue(StringProperty, value); } + get => GetValue(StringProperty); + set => SetValue(StringProperty, value); } - public string Bar - { - get { return GetValue(BarProperty); } - } + public string Bar => GetValue(BarProperty); } } \ No newline at end of file diff --git a/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaObjectTests_GetSubject.cs b/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaObjectTests_GetSubject.cs index 81f04dc53e..4cfe8e9804 100644 --- a/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaObjectTests_GetSubject.cs +++ b/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaObjectTests_GetSubject.cs @@ -37,8 +37,8 @@ namespace Avalonia.ReactiveUI.UnitTests public string Foo { - get { return GetValue(FooProperty); } - set { SetValue(FooProperty, value); } + get => GetValue(FooProperty); + set => SetValue(FooProperty, value); } } } diff --git a/tests/Avalonia.RenderTests/Media/ImageBrushTests.cs b/tests/Avalonia.RenderTests/Media/ImageBrushTests.cs index 09564cfe83..b8b292331e 100644 --- a/tests/Avalonia.RenderTests/Media/ImageBrushTests.cs +++ b/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] diff --git a/tests/Avalonia.RenderTests/Media/ImageDrawingTests.cs b/tests/Avalonia.RenderTests/Media/ImageDrawingTests.cs index 5ca21a3535..a86113b4ef 100644 --- a/tests/Avalonia.RenderTests/Media/ImageDrawingTests.cs +++ b/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] diff --git a/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs b/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs index 304b8c5cfd..2549958801 100644 --- a/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs +++ b/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