InheritDataTypeFromItems for DisplayMemberBinding & cleanup ItemsControl

src/Avalonia.Controls/ItemsControl.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Diagnostics.CodeAnalysis;
 using Avalonia.Automation.Peers;
 using Avalonia.Collections;
 using Avalonia.Controls.Generators;
@@ -17,7 +16,6 @@ using Avalonia.Layout;
 using Avalonia.LogicalTree;
 using Avalonia.Metadata;
 using Avalonia.Styling;
-using Avalonia.VisualTree;
 
 namespace Avalonia.Controls
 {
@@ -91,10 +89,11 @@ namespace Avalonia.Controls
         /// Gets or sets the <see cref="IBinding"/> to use for binding to the display member of each item.
         /// </summary>
         [AssignBinding]
+        [InheritDataTypeFromItems(nameof(Items))]
         public IBinding? DisplayMemberBinding
         {
-            get { return GetValue(DisplayMemberBindingProperty); }
+            get => GetValue(DisplayMemberBindingProperty);
-            set { SetValue(DisplayMemberBindingProperty, value); }
+            set => SetValue(DisplayMemberBindingProperty, value);
         }
         
         private IEnumerable? _items = new AvaloniaList<object>();
@@ -134,8 +133,8 @@ namespace Avalonia.Controls
         [Content]
         public IEnumerable? Items
         {
-            get { return _items; }
+            get => _items;
-            set { SetAndRaise(ItemsProperty, ref _items, value); }
+            set => SetAndRaise(ItemsProperty, ref _items, value);
         }
 
         /// <summary>
@@ -143,8 +142,8 @@ namespace Avalonia.Controls
         /// </summary>
         public ControlTheme? ItemContainerTheme
         {
-            get { return GetValue(ItemContainerThemeProperty); }
+            get => GetValue(ItemContainerThemeProperty); 
-            set { SetValue(ItemContainerThemeProperty, value); }
+            set => SetValue(ItemContainerThemeProperty, value);
         }
 
         /// <summary>
@@ -161,8 +160,8 @@ namespace Avalonia.Controls
         /// </summary>
         public ITemplate<Panel> ItemsPanel
         {
-            get { return GetValue(ItemsPanelProperty); }
+            get => GetValue(ItemsPanelProperty);
-            set { SetValue(ItemsPanelProperty, value); }
+            set => SetValue(ItemsPanelProperty, value);
         }
 
         /// <summary>
@@ -171,8 +170,8 @@ namespace Avalonia.Controls
         [InheritDataTypeFromItems(nameof(Items))]
         public IDataTemplate? ItemTemplate
         {
-            get { return GetValue(ItemTemplateProperty); }
+            get => GetValue(ItemTemplateProperty); 
-            set { SetValue(ItemTemplateProperty, value); }
+            set => SetValue(ItemTemplateProperty, value);
         }
 
         /// <summary>
@@ -264,8 +263,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool AreHorizontalSnapPointsRegular
         {
-            get { return GetValue(AreHorizontalSnapPointsRegularProperty); }
+            get => GetValue(AreHorizontalSnapPointsRegularProperty); 
-            set { SetValue(AreHorizontalSnapPointsRegularProperty, value); }
+            set => SetValue(AreHorizontalSnapPointsRegularProperty, value);
         }
 
         /// <summary>
@@ -273,8 +272,8 @@ namespace Avalonia.Controls
         /// </summary>
         public bool AreVerticalSnapPointsRegular
         {
-            get { return GetValue(AreVerticalSnapPointsRegularProperty); }
+            get => GetValue(AreVerticalSnapPointsRegularProperty); 
-            set { SetValue(AreVerticalSnapPointsRegularProperty, value); }
+            set => SetValue(AreVerticalSnapPointsRegularProperty, value);
         }
 
         /// <summary>