Enable nullability in ToolStripItemInternalLayout

[gpetrou]

Proposed changes

• Enable nullability in ToolStripItemInternalLayout.

Microsoft Reviewers: Open in CodeFlow

[RussKie]

GetLayoutData() must be annotated with MemeberNotNull. Though I'm not sure, if the analyzer will see it.

_currentLayoutOptions will always be initialised if EnsureLayout() is called, because it will get called at least once (for _layoutData is null) and, in turn, it'll invoke PerformLayout() that'll unconditionally invoke GetLayoutData(). So EnsureLayout() must be annotated with MemeberNotNull(_currentLayoutOptions).

Please add a comment above EnsureLayout explaining this.

[gpetrou]

Unfortunately, adding MemberNotNull for _currentLayoutOptions will not work, so I added a comment instead.

[RussKie]

Could you please elaborate why it won't work?

[gpetrou]

This is what I see:

Perhaps it is because I still use VS 2022 17.2 version? I see lots of other warnings, but the build still works.

[RussKie]

👍

We still need to do this:

diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripItem.ToolStripItemInternalLayout.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripItem.ToolStripItemInternalLayout.cs
index 6019222bb..469a5a04c 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripItem.ToolStripItemInternalLayout.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripItem.ToolStripItemInternalLayout.cs
@@ -135,17 +135,15 @@ namespace System.Windows.Forms
             }
 
             [MemberNotNull(nameof(_layoutData))]
-            private bool EnsureLayout()
+            private void EnsureLayout()
             {
                 if (_layoutData is null || _parentLayoutData is null || !_parentLayoutData.IsCurrent(ParentInternal))
                 {
                     PerformLayout();
-                    return true;
                 }
-
-                return false;
             }
 
+            [MemberNotNull(nameof(_currentLayoutOptions))]
             private ButtonBaseAdapter.LayoutData GetLayoutData()
             {
                 _currentLayoutOptions = CommonLayoutOptions();
@@ -181,6 +179,7 @@ namespace System.Windows.Forms
             }
 
             [MemberNotNull(nameof(_layoutData))]
+            [MemberNotNull(nameof(_currentLayoutOptions))]
             internal void PerformLayout()
             {
                 _layoutData = GetLayoutData();

[RussKie]

Thank you