Skip to content

[Foundation] Fix nullability in NSMutableDictionary. #24428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rolfbjarne merged 4 commits into from
Dec 15, 2025
Merged

[Foundation] Fix nullability in NSMutableDictionary. #24428

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5435ec
[Foundation] Fix nullability in NSMutableDictionary.
Dec 4, 2025
d883529
Update src/Foundation/NSDictionary.cs
rolfbjarne Dec 15, 2025
49a84c0
Remove on null value.
rolfbjarne Dec 15, 2025
b61b97b
Be sure to resolve to the expected indexer overload in test.
rolfbjarne Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/AudioToolbox/AudioFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2376,10 +2376,11 @@ public unsafe byte []? ID3Tag {
public AudioFileInfoDictionary? InfoDictionary {
get {
var ptr = GetIntPtr (AudioFileProperty.InfoDictionary);
if (ptr == IntPtr.Zero)
var dict = Runtime.GetNSObject<NSMutableDictionary> (ptr, owns: true);
if (dict is null)
return null;

return new AudioFileInfoDictionary (new NSMutableDictionary (ptr, true));
return new AudioFileInfoDictionary (dict);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/AudioToolbox/AudioToolbox.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ internal InstrumentInfo (NSDictionary d)
/// <summary>To be added.</summary>
/// <value>To be added.</value>
/// <remarks>To be added.</remarks>
public string Name {
get { return Dictionary [NameKey].ToString (); }
public string? Name {
get { return Dictionary [NameKey]?.ToString (); }
}

/// <summary>To be added.</summary>
Expand Down
36 changes: 24 additions & 12 deletions src/CoreText/CTFont.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,10 @@ public string? Name {
/// <remarks>To be added.</remarks>
public FontFeatureGroup FeatureGroup {
get {
return (FontFeatureGroup) (int) (NSNumber) Dictionary [CTFontFeatureKey.Identifier];
var number = (NSNumber?) Dictionary [CTFontFeatureKey.Identifier];
if (number is null)
return default;
return (FontFeatureGroup) (int) number;
}
}

Expand Down Expand Up @@ -591,7 +594,10 @@ internal static CTFontFeatureSelectors Create (FontFeatureGroup featureGroup, NS
/// <remarks>To be added.</remarks>
protected int FeatureWeak {
get {
return (int) (NSNumber) Dictionary [CTFontFeatureSelectorKey.Identifier];
var number = (NSNumber?) Dictionary [CTFontFeatureSelectorKey.Identifier];
if (number is null)
return default;
return (int) number;
}
}

Expand Down Expand Up @@ -2327,7 +2333,10 @@ internal CTFontFeatureSettings (NSDictionary dictionary)
/// <remarks>To be added.</remarks>
public FontFeatureGroup FeatureGroup {
get {
return (FontFeatureGroup) (int) (NSNumber) Dictionary [CTFontFeatureKey.Identifier];
var number = (NSNumber?) Dictionary [CTFontFeatureKey.Identifier];
if (number is null)
return default;
return (FontFeatureGroup) (int) number;
}
}

Expand All @@ -2336,7 +2345,10 @@ public FontFeatureGroup FeatureGroup {
/// <remarks>To be added.</remarks>
public int FeatureWeak {
get {
return (int) (NSNumber) Dictionary [CTFontFeatureSelectorKey.Identifier];
var number = (NSNumber?) Dictionary [CTFontFeatureSelectorKey.Identifier];
if (number is null)
return default;
return (int) number;
}
}
}
Expand Down Expand Up @@ -2375,32 +2387,32 @@ public CTFontVariationAxes (NSDictionary dictionary)
/// <summary>To be added.</summary>
/// <value>To be added.</value>
/// <remarks>To be added.</remarks>
public NSNumber Identifier {
get { return (NSNumber) Dictionary [CTFontVariationAxisKey.Identifier]; }
public NSNumber? Identifier {
get { return (NSNumber?) Dictionary [CTFontVariationAxisKey.Identifier]; }
set { Adapter.SetValue (Dictionary, CTFontVariationAxisKey.Identifier, value); }
}

/// <summary>To be added.</summary>
/// <value>To be added.</value>
/// <remarks>To be added.</remarks>
public NSNumber MinimumValue {
get { return (NSNumber) Dictionary [CTFontVariationAxisKey.MinimumValue]; }
public NSNumber? MinimumValue {
get { return (NSNumber?) Dictionary [CTFontVariationAxisKey.MinimumValue]; }
set { Adapter.SetValue (Dictionary, CTFontVariationAxisKey.MinimumValue, value); }
}

/// <summary>To be added.</summary>
/// <value>To be added.</value>
/// <remarks>To be added.</remarks>
public NSNumber MaximumValue {
get { return (NSNumber) Dictionary [CTFontVariationAxisKey.MaximumValue]; }
public NSNumber? MaximumValue {
get { return (NSNumber?) Dictionary [CTFontVariationAxisKey.MaximumValue]; }
set { Adapter.SetValue (Dictionary, CTFontVariationAxisKey.MaximumValue, value); }
}

/// <summary>To be added.</summary>
/// <value>To be added.</value>
/// <remarks>To be added.</remarks>
public NSNumber DefaultValue {
get { return (NSNumber) Dictionary [CTFontVariationAxisKey.DefaultValue]; }
public NSNumber? DefaultValue {
get { return (NSNumber?) Dictionary [CTFontVariationAxisKey.DefaultValue]; }
set { Adapter.SetValue (Dictionary, CTFontVariationAxisKey.DefaultValue, value); }
}

Expand Down
4 changes: 2 additions & 2 deletions src/CoreText/CTFontDescriptor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ public IEnumerable<CTFontDescriptor>? CascadeList {
/// <remarks>
/// </remarks>
public NSCharacterSet? CharacterSet {
get { return (NSCharacterSet) Dictionary [CTFontDescriptorAttributeKey.CharacterSet]; }
get { return (NSCharacterSet) Dictionary [CTFontDescriptorAttributeKey.CharacterSet]!; }
set { Adapter.SetValue (Dictionary, CTFontDescriptorAttributeKey.CharacterSet!, value); }
}

Expand Down Expand Up @@ -515,7 +515,7 @@ public bool? WeakEnabled {
/// </remarks>
public bool Enabled {
get {
var value = (NSNumber) Dictionary [CTFontDescriptorAttributeKey.Enabled];
var value = (NSNumber?) Dictionary [CTFontDescriptorAttributeKey.Enabled];
if (value is null)
return false;
return value.Int32Value != 0;
Expand Down
4 changes: 2 additions & 2 deletions src/CoreText/CTTextTab.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ public CTTextTabOptions (NSDictionary dictionary)
/// <summary>To be added.</summary>
/// <value>To be added.</value>
/// <remarks>To be added.</remarks>
public NSCharacterSet ColumnTerminators {
get { return (NSCharacterSet) Dictionary [CTTextTabOptionKey.ColumnTerminators]; }
public NSCharacterSet? ColumnTerminators {
get { return (NSCharacterSet?) Dictionary [CTTextTabOptionKey.ColumnTerminators]!; }
set { Adapter.SetValue (Dictionary, CTTextTabOptionKey.ColumnTerminators, value); }
}
}
Expand Down
42 changes: 22 additions & 20 deletions src/Foundation/NSDictionary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
//
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;

// Disable until we get around to enable + fix any issues.
#nullable disable
Expand Down Expand Up @@ -472,13 +473,13 @@ public bool TryGetValue (NSObject key, out NSObject value)
return value is not null;
}

/// <param name="key">Key to lookup</param>
/// <summary>Returns the value associated from a key in the dictionary, or null if the key is not found.</summary>
/// <value>
/// </value>
/// <remarks>
/// </remarks>
public virtual NSObject this [NSObject key] {
#nullable enable
/// <summary>Gets the object associated with the specified key.</summary>
/// <param name="key">The key of the object to get.</param>
/// <value>The object associated with the specified key.</value>
/// <remarks>Returns <see langword="null" /> if the key wasn't found.</remarks>
[DisallowNull] // don't allow setting null values
public virtual NSObject? this [NSObject key] {
get {
return ObjectForKey (key);
}
Expand All @@ -487,13 +488,12 @@ public virtual NSObject this [NSObject key] {
}
}

/// <param name="key">Key to lookup</param>
/// <summary>Returns the value associated from a key in the dictionary, or null if the key is not found.</summary>
/// <value>
/// </value>
/// <remarks>
/// </remarks>
public virtual NSObject this [NSString key] {
/// <summary>Gets the object associated with the specified key.</summary>
/// <param name="key">The key of the object to get.</param>
/// <value>The object associated with the specified key.</value>
/// <remarks>Returns <see langword="null" /> if the key wasn't found.</remarks>
[DisallowNull] // don't allow setting null values
public virtual NSObject? this [NSString key] {
get {
return ObjectForKey (key);
}
Expand All @@ -502,12 +502,13 @@ public virtual NSObject this [NSString key] {
}
}

/// <param name="key">Key to lookup</param>
/// <summary>Returns the value associated from a key in the dictionary, or null if the key is not found.</summary>
/// <value>
/// </value>
/// <remarks>The string will be marshalled as an NSString before performing the lookup.</remarks>
public virtual NSObject this [string key] {
/// <summary>Gets the object associated with the specified key.</summary>
/// <param name="key">The key of the object to get.</param>
/// <value>The object associated with the specified key.</value>
/// <exception cref="ArgumentNullException">Thrown when <paramref name="key"/> is <see langword="null"/>.</exception>
/// <remarks>Returns <see langword="null" /> if the key wasn't found.</remarks>
[DisallowNull] // don't allow setting null valuese performing the lookup.</remarks>
public virtual NSObject? this [string key] {
get {
if (key is null)
throw new ArgumentNullException ("key");
Expand All @@ -522,6 +523,7 @@ public virtual NSObject this [string key] {
throw new NotSupportedException ();
}
}
#nullable disable

ICollection<NSObject> IDictionary<NSObject, NSObject>.Keys {
get { return Keys; }
Expand Down
Loading
Loading