Fix nullable annotations in ITypedList (#80033)

gpetrou · web-flow · commit 339a204e35e7 · 2023-01-07T22:40:18.000-05:00
diff --git a/src/libraries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.cs b/src/libraries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.cs
@@ -702,8 +702,8 @@ public partial interface ITypeDescriptorContext : System.IServiceProvider
     }
     public partial interface ITypedList
     {
-        System.ComponentModel.PropertyDescriptorCollection GetItemProperties(System.ComponentModel.PropertyDescriptor[] listAccessors);
-        string GetListName(System.ComponentModel.PropertyDescriptor[] listAccessors);
+        System.ComponentModel.PropertyDescriptorCollection GetItemProperties(System.ComponentModel.PropertyDescriptor[]? listAccessors);
+        string GetListName(System.ComponentModel.PropertyDescriptor[]? listAccessors);
     }
     public abstract partial class License : System.IDisposable
     {
diff --git a/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/ITypedList.cs b/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/ITypedList.cs
@@ -5,8 +5,8 @@ namespace System.ComponentModel
 {
     public interface ITypedList
     {
-        string GetListName(PropertyDescriptor[] listAccessors);
+        string GetListName(PropertyDescriptor[]? listAccessors);
 
-        PropertyDescriptorCollection GetItemProperties(PropertyDescriptor[] listAccessors);
+        PropertyDescriptorCollection GetItemProperties(PropertyDescriptor[]? listAccessors);
     }
 }
diff --git a/src/libraries/System.Data.Common/ref/System.Data.Common.cs b/src/libraries/System.Data.Common/ref/System.Data.Common.cs
@@ -1049,8 +1049,8 @@ void System.ComponentModel.IBindingList.RemoveIndex(System.ComponentModel.Proper
         void System.ComponentModel.IBindingList.RemoveSort() { }
         void System.ComponentModel.IBindingListView.ApplySort(System.ComponentModel.ListSortDescriptionCollection sorts) { }
         void System.ComponentModel.IBindingListView.RemoveFilter() { }
-        System.ComponentModel.PropertyDescriptorCollection System.ComponentModel.ITypedList.GetItemProperties(System.ComponentModel.PropertyDescriptor[] listAccessors) { throw null; }
-        string System.ComponentModel.ITypedList.GetListName(System.ComponentModel.PropertyDescriptor[] listAccessors) { throw null; }
+        System.ComponentModel.PropertyDescriptorCollection System.ComponentModel.ITypedList.GetItemProperties(System.ComponentModel.PropertyDescriptor[]? listAccessors) { throw null; }
+        string System.ComponentModel.ITypedList.GetListName(System.ComponentModel.PropertyDescriptor[]? listAccessors) { throw null; }
         public System.Data.DataTable ToTable() { throw null; }
         public System.Data.DataTable ToTable(bool distinct, params string[] columnNames) { throw null; }
         public System.Data.DataTable ToTable(string? tableName) { throw null; }
@@ -1103,8 +1103,8 @@ void System.ComponentModel.IBindingList.ApplySort(System.ComponentModel.Property
         int System.ComponentModel.IBindingList.Find(System.ComponentModel.PropertyDescriptor property, object key) { throw null; }
         void System.ComponentModel.IBindingList.RemoveIndex(System.ComponentModel.PropertyDescriptor property) { }
         void System.ComponentModel.IBindingList.RemoveSort() { }
-        System.ComponentModel.PropertyDescriptorCollection System.ComponentModel.ITypedList.GetItemProperties(System.ComponentModel.PropertyDescriptor[] listAccessors) { throw null; }
-        string System.ComponentModel.ITypedList.GetListName(System.ComponentModel.PropertyDescriptor[] listAccessors) { throw null; }
+        System.ComponentModel.PropertyDescriptorCollection System.ComponentModel.ITypedList.GetItemProperties(System.ComponentModel.PropertyDescriptor[]? listAccessors) { throw null; }
+        string System.ComponentModel.ITypedList.GetListName(System.ComponentModel.PropertyDescriptor[]? listAccessors) { throw null; }
         protected virtual void TableCollectionChanged(object sender, System.ComponentModel.CollectionChangeEventArgs e) { }
     }
     [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.DataViewRowStateEditor, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
diff --git a/src/libraries/System.Data.Common/src/System/Data/DataView.cs b/src/libraries/System.Data.Common/src/System/Data/DataView.cs
@@ -1151,7 +1151,7 @@ internal ListSortDescriptionCollection GetSortDescriptions()
 
         #region ITypedList
 
-        string System.ComponentModel.ITypedList.GetListName(PropertyDescriptor[] listAccessors)
+        string System.ComponentModel.ITypedList.GetListName(PropertyDescriptor[]? listAccessors)
         {
             if (_table != null)
             {
@@ -1175,7 +1175,7 @@ string System.ComponentModel.ITypedList.GetListName(PropertyDescriptor[] listAcc
             return string.Empty;
         }
 
-        PropertyDescriptorCollection System.ComponentModel.ITypedList.GetItemProperties(PropertyDescriptor[] listAccessors)
+        PropertyDescriptorCollection System.ComponentModel.ITypedList.GetItemProperties(PropertyDescriptor[]? listAccessors)
         {
             if (_table != null)
             {
diff --git a/src/libraries/System.Data.Common/src/System/Data/DataViewManager.cs b/src/libraries/System.Data.Common/src/System/Data/DataViewManager.cs
@@ -256,7 +256,7 @@ void IBindingList.RemoveSort()
         }
 
         // SDUB: GetListName and GetItemProperties almost the same in DataView and DataViewManager
-        string System.ComponentModel.ITypedList.GetListName(PropertyDescriptor[] listAccessors)
+        string System.ComponentModel.ITypedList.GetListName(PropertyDescriptor[]? listAccessors)
         {
             DataSet? dataSet = DataSet;
             if (dataSet == null)
@@ -279,7 +279,7 @@ string System.ComponentModel.ITypedList.GetListName(PropertyDescriptor[] listAcc
             return string.Empty;
         }
 
-        PropertyDescriptorCollection System.ComponentModel.ITypedList.GetItemProperties(PropertyDescriptor[] listAccessors)
+        PropertyDescriptorCollection System.ComponentModel.ITypedList.GetItemProperties(PropertyDescriptor[]? listAccessors)
         {
             DataSet? dataSet = DataSet;
             if (dataSet == null)

Original file line number	Diff line number	Diff line change
`@@ -702,8 +702,8 @@ public partial interface ITypeDescriptorContext : System.IServiceProvider`
`702`	`702`	`}`
`703`	`703`	`public partial interface ITypedList`
`704`	`704`	`{`
`705`		`- System.ComponentModel.PropertyDescriptorCollection GetItemProperties(System.ComponentModel.PropertyDescriptor[] listAccessors);`
`706`		`- string GetListName(System.ComponentModel.PropertyDescriptor[] listAccessors);`
	`705`	`+ System.ComponentModel.PropertyDescriptorCollection GetItemProperties(System.ComponentModel.PropertyDescriptor[]? listAccessors);`
	`706`	`+ string GetListName(System.ComponentModel.PropertyDescriptor[]? listAccessors);`
`707`	`707`	`}`
`708`	`708`	`public abstract partial class License : System.IDisposable`
`709`	`709`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ namespace System.ComponentModel`
`5`	`5`	`{`
`6`	`6`	`public interface ITypedList`
`7`	`7`	`{`
`8`		`- string GetListName(PropertyDescriptor[] listAccessors);`
	`8`	`+ string GetListName(PropertyDescriptor[]? listAccessors);`
`9`	`9`
`10`		`- PropertyDescriptorCollection GetItemProperties(PropertyDescriptor[] listAccessors);`
	`10`	`+ PropertyDescriptorCollection GetItemProperties(PropertyDescriptor[]? listAccessors);`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1151,7 +1151,7 @@ internal ListSortDescriptionCollection GetSortDescriptions()`
`1151`	`1151`
`1152`	`1152`	`#region ITypedList`
`1153`	`1153`
`1154`		`- string System.ComponentModel.ITypedList.GetListName(PropertyDescriptor[] listAccessors)`
	`1154`	`+ string System.ComponentModel.ITypedList.GetListName(PropertyDescriptor[]? listAccessors)`
`1155`	`1155`	`{`
`1156`	`1156`	`if (_table != null)`
`1157`	`1157`	`{`
`@@ -1175,7 +1175,7 @@ string System.ComponentModel.ITypedList.GetListName(PropertyDescriptor[] listAcc`
`1175`	`1175`	`return string.Empty;`
`1176`	`1176`	`}`
`1177`	`1177`
`1178`		`- PropertyDescriptorCollection System.ComponentModel.ITypedList.GetItemProperties(PropertyDescriptor[] listAccessors)`
	`1178`	`+ PropertyDescriptorCollection System.ComponentModel.ITypedList.GetItemProperties(PropertyDescriptor[]? listAccessors)`
`1179`	`1179`	`{`
`1180`	`1180`	`if (_table != null)`
`1181`	`1181`	`{`
Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ void IBindingList.RemoveSort()`
`256`	`256`	`}`
`257`	`257`
`258`	`258`	`// SDUB: GetListName and GetItemProperties almost the same in DataView and DataViewManager`
`259`		`- string System.ComponentModel.ITypedList.GetListName(PropertyDescriptor[] listAccessors)`
	`259`	`+ string System.ComponentModel.ITypedList.GetListName(PropertyDescriptor[]? listAccessors)`
`260`	`260`	`{`
`261`	`261`	`DataSet? dataSet = DataSet;`
`262`	`262`	`if (dataSet == null)`
`@@ -279,7 +279,7 @@ string System.ComponentModel.ITypedList.GetListName(PropertyDescriptor[] listAcc`
`279`	`279`	`return string.Empty;`
`280`	`280`	`}`
`281`	`281`
`282`		`- PropertyDescriptorCollection System.ComponentModel.ITypedList.GetItemProperties(PropertyDescriptor[] listAccessors)`
	`282`	`+ PropertyDescriptorCollection System.ComponentModel.ITypedList.GetItemProperties(PropertyDescriptor[]? listAccessors)`
`283`	`283`	`{`
`284`	`284`	`DataSet? dataSet = DataSet;`
`285`	`285`	`if (dataSet == null)`