Update OnSelectedItemName_Paint: When selectedItem.Site is null, only show selectedItem type in Items Collection Editor

Author: LeafShi1

src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ToolStripCollectionEditor.ToolStripItemEditorForm.cs

@@ -590,8 +590,8 @@ private void OnNewItemTypes_SelectionChangeCommitted(object sender, EventArgs e)
                 {
                     if (ex.IsCriticalException())
                     {
-                    throw;
-                }
+                        throw;
+                    }
                 }
 
                 PropertyDescriptor imageProperty = TypeDescriptor.GetProperties(newItem)[nameof(Image)];
@@ -885,33 +885,30 @@ private void OnSelectedItemName_Paint(object sender, PaintEventArgs e)
                     selectedItem = _listBoxItems.SelectedItem is ToolStrip strip ? strip : (ToolStripItem)_listBoxItems.SelectedItem;
 
                     string className = "&" + selectedItem.GetType().Name;
-                    if (selectedItem.Site is not null)
-                    {
-                        // Erase background
-                        e.Graphics.FillRectangle(SystemBrushes.Control, bounds);
-                        string itemName = selectedItem.Site.Name;
-
-                        if (label is not null)
-                        {
-                            label.Text = className + itemName;
-                        }
+                    // Erase background
+                    e.Graphics.FillRectangle(SystemBrushes.Control, bounds);
+                    string itemName = selectedItem.Site?.Name ?? string.Empty;
 
-                        int classWidth = 0;
-                        classWidth = (int)e.Graphics.MeasureString(className, boldFont).Width;
-                        e.Graphics.DrawString(className, boldFont, SystemBrushes.WindowText, bounds, stringFormat);
-                        int itemTextWidth = (int)e.Graphics.MeasureString(itemName, _selectedItemName.Font).Width;
-                        Rectangle textRect = new(classWidth + GdiPlusExtraSpace, 0, bounds.Width - (classWidth + GdiPlusExtraSpace), bounds.Height);
-                        label.AutoEllipsis = itemTextWidth > textRect.Width;
+                    if (label is not null)
+                    {
+                        label.Text = className + itemName;
+                    }
 
-                        TextFormatFlags flags = TextFormatFlags.EndEllipsis | TextFormatFlags.PreserveGraphicsTranslateTransform | TextFormatFlags.PreserveGraphicsClipping;
-                        if (rightToLeft)
-                        {
-                            flags |= TextFormatFlags.RightToLeft;
-                        }
+                    int classWidth = 0;
+                    classWidth = (int)e.Graphics.MeasureString(className, boldFont).Width;
+                    e.Graphics.DrawString(className, boldFont, SystemBrushes.WindowText, bounds, stringFormat);
+                    int itemTextWidth = (int)e.Graphics.MeasureString(itemName, _selectedItemName.Font).Width;
+                    Rectangle textRect = new(classWidth + GdiPlusExtraSpace, 0, bounds.Width - (classWidth + GdiPlusExtraSpace), bounds.Height);
+                    label.AutoEllipsis = itemTextWidth > textRect.Width;
 
-                        TextRenderer.DrawText(e.Graphics, itemName, _selectedItemName.Font, textRect, SystemColors.WindowText, flags);
+                    TextFormatFlags flags = TextFormatFlags.EndEllipsis | TextFormatFlags.PreserveGraphicsTranslateTransform | TextFormatFlags.PreserveGraphicsClipping;
+                    if (rightToLeft)
+                    {
+                        flags |= TextFormatFlags.RightToLeft;
                     }
 
+                    TextRenderer.DrawText(e.Graphics, itemName, _selectedItemName.Font, textRect, SystemColors.WindowText, flags);
+
                     break;
                 case 0:
                     // Erase background.