Skip to content

Fix nullability annotations in TypeCodeDomSerializer and DesignerActionBehavior #10159

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
lonitra merged 2 commits into from
Oct 20, 2023
Merged

Fix nullability annotations in TypeCodeDomSerializer and DesignerActionBehavior #10159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
131abb4
fix nullability annotations in TypeCodeDomSerializer
halgab Oct 20, 2023
7dab0dd
fix nullability annotations of DesignerActionBehavior
halgab Oct 20, 2023
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
2 changes: 1 addition & 1 deletion ...dows.Forms.Design/src/System/ComponentModel/Design/Serialization/TypeCodeDomSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ private void IntegrateStatements(IDesignerSerializationManager manager, object r
{
map.Combine();
typeDecl.Members.Add(map.Method);
Trace(TraceLevel.Verbose, $"...generated {map.Method.Statements.Count} statements into method {map.Method.Name}");
Trace(TraceLevel.Verbose, $"...generated {map.Method!.Statements.Count} statements into method {map.Method.Name}");
}
}
}
4 changes: 2 additions & 2 deletions ...m.Windows.Forms.Design/src/System/Windows/Forms/Design/Behavior/DesignerActionBehavior.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ namespace System.Windows.Forms.Design.Behavior;
/// </summary>
internal sealed class DesignerActionBehavior : Behavior
{
private readonly IServiceProvider? _serviceProvider; // we need to cache the service provider here to be able to create the panel with the proper arguments
private readonly IServiceProvider _serviceProvider; // we need to cache the service provider here to be able to create the panel with the proper arguments
private bool _ignoreNextMouseUp;

/// <summary>
/// Constructor that calls base and caches off the action lists.
/// </summary>
internal DesignerActionBehavior(IServiceProvider? serviceProvider, IComponent relatedComponent, DesignerActionListCollection actionLists, DesignerActionUI parentUI)
internal DesignerActionBehavior(IServiceProvider serviceProvider, IComponent relatedComponent, DesignerActionListCollection actionLists, DesignerActionUI parentUI)
{
ActionLists = actionLists;
_serviceProvider = serviceProvider;
Expand Down