use target typed new

mennowo · Apr 13, 2023 · c4d8ef7 · c4d8ef7
1 parent 4052b90
commit c4d8ef7
Show file tree

Hide file tree

Showing 13 changed files with 82 additions and 83 deletions.
diff --git a/Gu.Wpf.DataGrid2D.Demo/Perf/BigDataGridViewModel.cs b/Gu.Wpf.DataGrid2D.Demo/Perf/BigDataGridViewModel.cs
@@ -9,7 +9,7 @@ namespace Gu.Wpf.DataGrid2D.Demo
 
     public sealed class BigDataGridViewModel : INotifyPropertyChanged
     {
-        public static readonly BigDataGridViewModel Default = new BigDataGridViewModel();
+        public static readonly BigDataGridViewModel Default = new();
         private string[]? rowHeaders;
         private string[]? columnHeaders;
         private int[,]? data2D;

diff --git a/Gu.Wpf.DataGrid2D.Demo/TransposedVm.cs b/Gu.Wpf.DataGrid2D.Demo/TransposedVm.cs
@@ -1,4 +1,4 @@
-namespace Gu.Wpf.DataGrid2D.Demo
+namespace Gu.Wpf.DataGrid2D.Demo
 {
     using System.Collections.ObjectModel;
 
@@ -10,8 +10,8 @@ public TransposedVm()
             this.Persons.Add(new Person { FirstName = "Erik", LastName = "Svensson" });
         }
 
-        public ObservableCollection<Person> Persons { get; } = new ObservableCollection<Person>();
+        public ObservableCollection<Person> Persons { get; } = new();
 
-        public Person Person { get; } = new Person { FirstName = "Johan", LastName = "Larsson" };
+        public Person Person { get; } = new() { FirstName = "Johan", LastName = "Larsson" };
     }
 }
diff --git a/Gu.Wpf.DataGrid2D.Tests/Helpers/CollectionChangedEventArgsComparer.cs b/Gu.Wpf.DataGrid2D.Tests/Helpers/CollectionChangedEventArgsComparer.cs
@@ -6,7 +6,7 @@ namespace Gu.Wpf.DataGrid2D.Tests
 
     public sealed class CollectionChangedEventArgsComparer : IComparer, IComparer<NotifyCollectionChangedEventArgs>
     {
-        public static readonly CollectionChangedEventArgsComparer Default = new CollectionChangedEventArgsComparer();
+        public static readonly CollectionChangedEventArgsComparer Default = new();
 
         private CollectionChangedEventArgsComparer()
         {

diff --git a/Gu.Wpf.DataGrid2D.Tests/ItemsSourceTests.cs b/Gu.Wpf.DataGrid2D.Tests/ItemsSourceTests.cs
@@ -66,9 +66,9 @@ public static void RowsSourceRemove()
         {
             var ints = new ObservableCollection<ObservableCollection<int>>
             {
-                new ObservableCollection<int>(new[] { 1, 2 }),
-                new ObservableCollection<int>(new[] { 3, 4 }),
-                new ObservableCollection<int>(new[] { 5, 6 }),
+                new(new[] { 1, 2 }),
+                new(new[] { 3, 4 }),
+                new(new[] { 5, 6 }),
             };
             var dataGrid = new DataGrid();
             dataGrid.SetValue(ItemsSource.RowsSourceProperty, ints);
@@ -101,9 +101,9 @@ public static void RowsSourceAddRow()
         {
             var ints = new ObservableCollection<ObservableCollection<int>>
             {
-                new ObservableCollection<int>(new[] { 1, 2 }),
-                new ObservableCollection<int>(new[] { 3, 4 }),
-                new ObservableCollection<int>(new[] { 5, 6 }),
+                new(new[] { 1, 2 }),
+                new(new[] { 3, 4 }),
+                new(new[] { 5, 6 }),
             };
             var dataGrid = new DataGrid();
             dataGrid.SetValue(ItemsSource.RowsSourceProperty, ints);
@@ -143,9 +143,9 @@ public static void ColumnsSource()
         {
             var ints = new ObservableCollection<ObservableCollection<int>>
             {
-                new ObservableCollection<int>(new[] { 1, 2 }),
-                new ObservableCollection<int>(new[] { 3, 4 }),
-                new ObservableCollection<int>(new[] { 5, 6 }),
+                new(new[] { 1, 2 }),
+                new(new[] { 3, 4 }),
+                new(new[] { 5, 6 }),
             };
             var dataGrid = new DataGrid();
             dataGrid.SetValue(ItemsSource.ColumnsSourceProperty, ints);
@@ -164,7 +164,7 @@ public static void ColumnsSource()
         [Test]
         public static void TransposedSource()
         {
-            var persons = new ObservableCollection<Person> { new Person { FirstName = "Johan", LastName = "Larsson" } };
+            var persons = new ObservableCollection<Person> { new() { FirstName = "Johan", LastName = "Larsson" } };
             var dataGrid = new DataGrid();
             dataGrid.SetValue(ItemsSource.TransposedSourceProperty, persons);
             dataGrid.Initialize();

diff --git a/Gu.Wpf.DataGrid2D.Tests/Views/Lists2DTransposedView.ColumnsChanged.cs b/Gu.Wpf.DataGrid2D.Tests/Views/Lists2DTransposedView.ColumnsChanged.cs
@@ -12,8 +12,8 @@ public static void SignalsWhenColumnIsAdded()
             {
                 var ints = new ObservableCollection<ObservableCollection<int>>
                 {
-                    new ObservableCollection<int>(new[] { 1, 2 }),
-                    new ObservableCollection<int>(new[] { 3, 4 }),
+                    new(new[] { 1, 2 }),
+                    new(new[] { 3, 4 }),
                 };
                 using var view = new Lists2DTransposedView(ints);
                 var count = 0;
@@ -27,9 +27,9 @@ public static void SignalsWhenColumnIsRemoved()
             {
                 var ints = new ObservableCollection<ObservableCollection<int>>
                 {
-                    new ObservableCollection<int>(new[] { 2 }),
-                    new ObservableCollection<int>(new[] { 3 }),
-                    new ObservableCollection<int>(new[] { 5, 6 }),
+                    new(new[] { 2 }),
+                    new(new[] { 3 }),
+                    new(new[] { 5, 6 }),
                 };
                 using var view = new Lists2DTransposedView(ints);
                 var count = 0;
@@ -43,9 +43,9 @@ public static void SignalsWhenColumnBecomesReadOnly()
             {
                 var ints = new ObservableCollection<ObservableCollection<int>>
                 {
-                    new ObservableCollection<int>(new[] { 1, 2 }),
-                    new ObservableCollection<int>(new[] { 3, 4 }),
-                    new ObservableCollection<int>(new[] { 5, 6 }),
+                    new(new[] { 1, 2 }),
+                    new(new[] { 3, 4 }),
+                    new(new[] { 5, 6 }),
                 };
                 using var view = new Lists2DTransposedView(ints);
                 var count = 0;
@@ -59,9 +59,9 @@ public static void SignalsWhenColumnBecomesReadOnly2()
             {
                 var ints = new ObservableCollection<ObservableCollection<int>>
                 {
-                    new ObservableCollection<int>(new[] { 2, 3 }),
-                    new ObservableCollection<int>(new[] { 3, 4 }),
-                    new ObservableCollection<int>(new[] { 5, 6 }),
+                    new(new[] { 2, 3 }),
+                    new(new[] { 3, 4 }),
+                    new(new[] { 5, 6 }),
                 };
                 using var view = new Lists2DTransposedView(ints);
                 var count = 0;
@@ -75,9 +75,9 @@ public static void SignalsWhenColumnBecomesEditable()
             {
                 var ints = new ObservableCollection<ObservableCollection<int>>
                 {
-                    new ObservableCollection<int>(new[] { 2 }),
-                    new ObservableCollection<int>(new[] { 3, 4 }),
-                    new ObservableCollection<int>(new[] { 5, 6 }),
+                    new(new[] { 2 }),
+                    new(new[] { 3, 4 }),
+                    new(new[] { 5, 6 }),
                 };
                 using var view = new Lists2DTransposedView(ints);
                 var count = 0;
@@ -91,9 +91,9 @@ public static void SignalsWhenColumnsBecomesEditable()
             {
                 var ints = new ObservableCollection<ObservableCollection<int>>
                 {
-                    new ObservableCollection<int>(new[] { 2 }),
-                    new ObservableCollection<int>(new[] { 3 }),
-                    new ObservableCollection<int>(new[] { 5, 6 }),
+                    new(new[] { 2 }),
+                    new(new[] { 3 }),
+                    new(new[] { 5, 6 }),
                 };
                 using var view = new Lists2DTransposedView(ints);
                 var count = 0;
@@ -107,8 +107,8 @@ public static void NoChangeWhenAlreadyReadOnly()
             {
                 var ints = new ObservableCollection<ObservableCollection<int>>
                 {
-                    new ObservableCollection<int>(new[] { 1, 2 }),
-                    new ObservableCollection<int>(new[] { 3, 4, 5 }),
+                    new(new[] { 1, 2 }),
+                    new(new[] { 3, 4, 5 }),
                 };
                 using var view = new Lists2DTransposedView(ints);
                 var count = 0;
@@ -122,9 +122,9 @@ public static void NoChangeWhenUpdateCell()
             {
                 var ints = new ObservableCollection<ObservableCollection<int>>
                 {
-                    new ObservableCollection<int>(new[] { 1 }),
-                    new ObservableCollection<int>(new[] { 3, 4 }),
-                    new ObservableCollection<int>(new[] { 5, 6 }),
+                    new(new[] { 1 }),
+                    new(new[] { 3, 4 }),
+                    new(new[] { 5, 6 }),
                 };
                 using var view = new Lists2DTransposedView(ints);
                 var count = 0;

diff --git a/Gu.Wpf.DataGrid2D.Tests/Views/Lists2DTransposedViewTests.cs b/Gu.Wpf.DataGrid2D.Tests/Views/Lists2DTransposedViewTests.cs
@@ -31,9 +31,9 @@ public static void CreateFromObservableCollections()
         {
             var ints = new ObservableCollection<ObservableCollection<int>>
             {
-                new ObservableCollection<int>(new[] { 1, 2 }),
-                new ObservableCollection<int>(new[] { 3, 4 }),
-                new ObservableCollection<int>(new[] { 5, 6 }),
+                new(new[] { 1, 2 }),
+                new(new[] { 3, 4 }),
+                new(new[] { 5, 6 }),
             };
             using var view = new Lists2DTransposedView(ints);
             Assert.AreEqual(2, view.Count);

diff --git a/Gu.Wpf.DataGrid2D.Tests/Views/Lists2DViewTests.ColumnsChanged.cs b/Gu.Wpf.DataGrid2D.Tests/Views/Lists2DViewTests.ColumnsChanged.cs
@@ -12,9 +12,9 @@ public static void SignalsWhenColumnIsAdded()
             {
                 var ints = new ObservableCollection<ObservableCollection<int>>
                 {
-                    new ObservableCollection<int>(new[] { 2, 3 }),
-                    new ObservableCollection<int>(new[] { 3, 4 }),
-                    new ObservableCollection<int>(new[] { 5, 6 }),
+                    new(new[] { 2, 3 }),
+                    new(new[] { 3, 4 }),
+                    new(new[] { 5, 6 }),
                 };
                 using var view = new Lists2DView(ints);
                 var count = 0;
@@ -28,9 +28,9 @@ public static void SignalsWhenColumnIsAdded2()
             {
                 var ints = new ObservableCollection<ObservableCollection<int>>
                 {
-                    new ObservableCollection<int>(new[] { 2, 3 }),
-                    new ObservableCollection<int>(new[] { 3, 4 }),
-                    new ObservableCollection<int>(new[] { 5, 6 }),
+                    new(new[] { 2, 3 }),
+                    new(new[] { 3, 4 }),
+                    new(new[] { 5, 6 }),
                 };
                 using var view = new Lists2DView(ints);
                 var count = 0;
@@ -44,9 +44,9 @@ public static void SignalsWhenColumnIsRemoved()
             {
                 var ints = new ObservableCollection<ObservableCollection<int>>
                 {
-                    new ObservableCollection<int>(new[] { 2 }),
-                    new ObservableCollection<int>(new[] { 3 }),
-                    new ObservableCollection<int>(new[] { 5, 6 }),
+                    new(new[] { 2 }),
+                    new(new[] { 3 }),
+                    new(new[] { 5, 6 }),
                 };
                 using var view = new Lists2DView(ints);
                 var count = 0;
@@ -60,9 +60,9 @@ public static void SignalsWhenColumnIsRemoved2()
             {
                 var ints = new ObservableCollection<ObservableCollection<int>>
                 {
-                    new ObservableCollection<int>(new[] { 2 }),
-                    new ObservableCollection<int>(new[] { 3 }),
-                    new ObservableCollection<int>(new[] { 5, 6 }),
+                    new(new[] { 2 }),
+                    new(new[] { 3 }),
+                    new(new[] { 5, 6 }),
                 };
                 using var view = new Lists2DView(ints);
                 var count = 0;
@@ -76,9 +76,9 @@ public static void SignalsWhenColumnBecomesReadOnly()
             {
                 var ints = new ObservableCollection<ObservableCollection<int>>
                 {
-                    new ObservableCollection<int>(new[] { 1, 2 }),
-                    new ObservableCollection<int>(new[] { 3, 4 }),
-                    new ObservableCollection<int>(new[] { 5, 6 }),
+                    new(new[] { 1, 2 }),
+                    new(new[] { 3, 4 }),
+                    new(new[] { 5, 6 }),
                 };
                 using var view = new Lists2DView(ints);
                 var count = 0;
@@ -92,9 +92,9 @@ public static void SignalsWhenColumnBecomesEditable()
             {
                 var ints = new ObservableCollection<ObservableCollection<int>>
                 {
-                    new ObservableCollection<int>(new[] { 2 }),
-                    new ObservableCollection<int>(new[] { 3, 4 }),
-                    new ObservableCollection<int>(new[] { 5, 6 }),
+                    new(new[] { 2 }),
+                    new(new[] { 3, 4 }),
+                    new(new[] { 5, 6 }),
                 };
                 using var view = new Lists2DView(ints);
                 var count = 0;
@@ -108,9 +108,9 @@ public static void NoChangeWhenAlreadyReadOnly()
             {
                 var ints = new ObservableCollection<ObservableCollection<int>>
                 {
-                    new ObservableCollection<int>(new[] { 2 }),
-                    new ObservableCollection<int>(new[] { 3, 4 }),
-                    new ObservableCollection<int>(new[] { 5, 6 }),
+                    new(new[] { 2 }),
+                    new(new[] { 3, 4 }),
+                    new(new[] { 5, 6 }),
                 };
                 using var view = new Lists2DView(ints);
                 var count = 0;
@@ -124,9 +124,9 @@ public static void NoChangeWhenUpdateCell()
             {
                 var ints = new ObservableCollection<ObservableCollection<int>>
                 {
-                    new ObservableCollection<int>(new[] { 1 }),
-                    new ObservableCollection<int>(new[] { 3, 4 }),
-                    new ObservableCollection<int>(new[] { 5, 6 }),
+                    new(new[] { 1 }),
+                    new(new[] { 3, 4 }),
+                    new(new[] { 5, 6 }),
                 };
                 using var view = new Lists2DView(ints);
                 var count = 0;

diff --git a/Gu.Wpf.DataGrid2D.Tests/Views/Lists2DViewTests.cs b/Gu.Wpf.DataGrid2D.Tests/Views/Lists2DViewTests.cs
@@ -43,9 +43,9 @@ public static void CreateFromObservableCollections()
         {
             var ints = new ObservableCollection<ObservableCollection<int>>
             {
-                new ObservableCollection<int>(new[] { 1, 2 }),
-                new ObservableCollection<int>(new[] { 3, 4 }),
-                new ObservableCollection<int>(new[] { 5, 6 }),
+                new(new[] { 1, 2 }),
+                new(new[] { 3, 4 }),
+                new(new[] { 5, 6 }),
             };
             using var view = new Lists2DView(ints);
             Assert.AreEqual(3, view.Count);
@@ -91,9 +91,9 @@ public static void ObservesAndNotifies()
         {
             var ints = new ObservableCollection<ObservableCollection<int>>
             {
-                new ObservableCollection<int>(new[] { 1, 2 }),
-                new ObservableCollection<int>(new[] { 3, 4 }),
-                new ObservableCollection<int>(new[] { 5, 6 }),
+                new(new[] { 1, 2 }),
+                new(new[] { 3, 4 }),
+                new(new[] { 5, 6 }),
             };
             using var view = new Lists2DView(ints);
             var expectedPropertyChanges = new List<string>();

diff --git a/Gu.Wpf.DataGrid2D/Internals/Array2DIndexPropertyDescriptor.cs b/Gu.Wpf.DataGrid2D/Internals/Array2DIndexPropertyDescriptor.cs
@@ -6,8 +6,8 @@ namespace Gu.Wpf.DataGrid2D
 
     internal class Array2DIndexPropertyDescriptor : IndexPropertyDescriptor
     {
-        private static readonly ConcurrentDictionary<Key, PropertyDescriptorCollection> RowDescriptorCache = new ConcurrentDictionary<Key, PropertyDescriptorCollection>();
-        private static readonly ConcurrentDictionary<Key, PropertyDescriptorCollection> ColumnDescriptorCache = new ConcurrentDictionary<Key, PropertyDescriptorCollection>();
+        private static readonly ConcurrentDictionary<Key, PropertyDescriptorCollection> RowDescriptorCache = new();
+        private static readonly ConcurrentDictionary<Key, PropertyDescriptorCollection> ColumnDescriptorCache = new();
 
         private Array2DIndexPropertyDescriptor(Type elementType, int index)
             : base(elementType, index, isReadOnly: false)
@@ -89,7 +89,7 @@ static PropertyDescriptorCollection Create(Key key)
 
         private struct Key : IEquatable<Key>
         {
-            internal static readonly Key Empty = new Key(typeof(int), 0);
+            internal static readonly Key Empty = new(typeof(int), 0);
 
             internal readonly Type ElementType;
             internal readonly int Length;

diff --git a/Gu.Wpf.DataGrid2D/Internals/BindingHelper.cs b/Gu.Wpf.DataGrid2D/Internals/BindingHelper.cs
@@ -6,10 +6,9 @@ namespace Gu.Wpf.DataGrid2D
 
     internal static class BindingHelper
     {
-        private static readonly Dictionary<int, PropertyPath> IndexPaths = new Dictionary<int, PropertyPath>();
+        private static readonly Dictionary<int, PropertyPath> IndexPaths = new();
 
-        private static readonly Dictionary<DependencyProperty, PropertyPath> PropertyPaths =
-            new Dictionary<DependencyProperty, PropertyPath>();
+        private static readonly Dictionary<DependencyProperty, PropertyPath> PropertyPaths = new();
 
         internal static BindingBuilder Bind(
             this DependencyObject target,

diff --git a/Gu.Wpf.DataGrid2D/RowColumnIndex.cs b/Gu.Wpf.DataGrid2D/RowColumnIndex.cs
@@ -13,7 +13,7 @@ public struct RowColumnIndex : IEquatable<RowColumnIndex>
         /// <summary>
         /// No selection.
         /// </summary>
-        public static readonly RowColumnIndex None = new RowColumnIndex(-1);
+        public static readonly RowColumnIndex None = new(-1);
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RowColumnIndex"/> struct.

diff --git a/Gu.Wpf.DataGrid2D/Views/Array2DView.cs b/Gu.Wpf.DataGrid2D/Views/Array2DView.cs
@@ -12,7 +12,7 @@ namespace Gu.Wpf.DataGrid2D
     public class Array2DView : IList, IView2D
 #pragma warning restore CA1010 // Collections should implement generic interface
     {
-        private readonly WeakReference source = new WeakReference(null);
+        private readonly WeakReference source = new(null);
         private readonly Array2DRowView[] rows;
 
         private Array2DView(Array source, bool isTransposed)