fix a bug introduced in the DesignerActionPanel refactoring

halgab · halgab · commit 415b471f131d · 2023-10-16T10:46:53.000+02:00
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.CheckBoxPropertyLine.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.CheckBoxPropertyLine.cs
@@ -63,7 +63,9 @@ protected override void OnValueChanged()
             _checkBox.Checked = (bool)Value;
         }
 
-        public sealed class Info(DesignerActionList list, DesignerActionPropertyItem item) : PropertyLineInfo(list, item)
+        public static StandardLineInfo CreateLineInfo(DesignerActionList list, DesignerActionPropertyItem item) => new Info(list, item);
+
+        private sealed class Info(DesignerActionList list, DesignerActionPropertyItem item) : PropertyLineInfo(list, item)
         {
             public override Line CreateLine(IServiceProvider serviceProvider, DesignerActionPanel actionPanel)
             {
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.EditorPropertyLine.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.EditorPropertyLine.cs
@@ -475,7 +475,9 @@ protected override bool ProcessDialogKey(Keys keyData)
             }
         }
 
-        public new sealed class Info(DesignerActionList list, DesignerActionPropertyItem item) : PropertyLineInfo(list, item)
+        public static new StandardLineInfo CreateLineInfo(DesignerActionList list, DesignerActionPropertyItem item) => new Info(list, item);
+
+        private sealed class Info(DesignerActionList list, DesignerActionPropertyItem item) : PropertyLineInfo(list, item)
         {
             public override Line CreateLine(IServiceProvider serviceProvider, DesignerActionPanel actionPanel)
             {
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.HeaderLine.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.HeaderLine.cs
@@ -15,9 +15,10 @@ private HeaderLine(IServiceProvider serviceProvider, DesignerActionPanel actionP
 
         protected override Font GetFont() => new(ActionPanel.Font, FontStyle.Bold);
 
-        public new sealed class Info(DesignerActionList list, DesignerActionTextItem item) : StandardLineInfo(list)
+        public static new StandardLineInfo CreateLineInfo(DesignerActionList list, DesignerActionTextItem item) => new HeaderTextLineInfo(list, item);
+
+        private sealed class HeaderTextLineInfo(DesignerActionList list, DesignerActionTextItem item) : TextLineInfo(list, item)
         {
-            public override DesignerActionTextItem Item { get; } = item;
             public override Line CreateLine(IServiceProvider serviceProvider, DesignerActionPanel actionPanel)
             {
                 return new HeaderLine(serviceProvider, actionPanel);
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.MethodLine.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.MethodLine.cs
@@ -110,7 +110,8 @@ protected override bool ProcessDialogKey(Keys keyData)
             }
         }
 
-        public sealed class Info(DesignerActionList list, DesignerActionMethodItem item) : StandardLineInfo(list)
+        public static StandardLineInfo CreateLineInfo(DesignerActionList list, DesignerActionMethodItem item) => new Info(list, item);
+        private sealed class Info(DesignerActionList list, DesignerActionMethodItem item) : StandardLineInfo(list)
         {
             public override DesignerActionMethodItem Item { get; } = item;
             public override Line CreateLine(IServiceProvider serviceProvider, DesignerActionPanel actionPanel)
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.PropertyLine.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.PropertyLine.cs
@@ -112,7 +112,7 @@ internal sealed override void UpdateActionItem(LineInfo lineInfo, ToolTip toolTi
             }
         }
 
-        public abstract class PropertyLineInfo(DesignerActionList list, DesignerActionPropertyItem item) : StandardLineInfo(list)
+        protected abstract class PropertyLineInfo(DesignerActionList list, DesignerActionPropertyItem item) : StandardLineInfo(list)
         {
             public override DesignerActionPropertyItem Item { get; } = item;
         }
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.TextBoxPropertyLine.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.TextBoxPropertyLine.cs
@@ -359,7 +359,9 @@ public EditorLabelAccessibleObject(EditorLabel owner)
             }
         }
 
-        public sealed class Info(DesignerActionList list, DesignerActionPropertyItem item) : PropertyLineInfo(list, item)
+        public static StandardLineInfo CreateLineInfo(DesignerActionList list, DesignerActionPropertyItem item) => new Info(list, item);
+
+        private sealed class Info(DesignerActionList list, DesignerActionPropertyItem item) : PropertyLineInfo(list, item)
         {
             public override Line CreateLine(IServiceProvider serviceProvider, DesignerActionPanel actionPanel)
             {
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.TextLine.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.TextLine.cs
@@ -63,15 +63,17 @@ protected virtual Font GetFont()
 
         internal override void UpdateActionItem(LineInfo lineInfo, ToolTip toolTip, ref int currentTabIndex)
         {
-            Info info = (Info)lineInfo;
-            _textItem = info.Item;
+            TextLineInfo textLineInfo = (TextLineInfo)lineInfo;
+            _textItem = textLineInfo.Item;
             _label.Text = StripAmpersands(_textItem.DisplayName);
             _label.Font = GetFont();
             _label.TabIndex = currentTabIndex++;
             toolTip.SetToolTip(_label, _textItem.Description);
         }
 
-        public sealed class Info(DesignerActionList list, DesignerActionTextItem item) : StandardLineInfo(list)
+        public static StandardLineInfo CreateLineInfo(DesignerActionList list, DesignerActionTextItem item) => new TextLineInfo(list, item);
+
+        protected class TextLineInfo(DesignerActionList list, DesignerActionTextItem item) : StandardLineInfo(list)
         {
             public override DesignerActionTextItem Item { get; } = item;
             public override Line CreateLine(IServiceProvider serviceProvider, DesignerActionPanel actionPanel)
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.cs
@@ -661,7 +661,7 @@ private StandardLineInfo ProcessTaskItem(DesignerActionList list, DesignerAction
     {
         if (item is DesignerActionMethodItem methodItem)
         {
-            return new MethodLine.Info(list, methodItem);
+            return MethodLine.CreateLineInfo(list, methodItem);
         }
         else if (item is DesignerActionPropertyItem pti)
         {
@@ -675,37 +675,37 @@ private StandardLineInfo ProcessTaskItem(DesignerActionList list, DesignerAction
             bool standardValuesSupported = pd.Converter.GetStandardValuesSupported(context);
             if (pd.TryGetEditor(out UITypeEditor _))
             {
-                return new EditorPropertyLine.Info(list, pti);
+                return EditorPropertyLine.CreateLineInfo(list, pti);
             }
             else if (pd.PropertyType == typeof(bool))
             {
                 if (IsReadOnlyProperty(pd))
                 {
-                    return new TextBoxPropertyLine.Info(list, pti);
+                    return TextBoxPropertyLine.CreateLineInfo(list, pti);
                 }
                 else
                 {
-                    return new CheckBoxPropertyLine.Info(list, pti);
+                    return CheckBoxPropertyLine.CreateLineInfo(list, pti);
                 }
             }
             else if (standardValuesSupported)
             {
-                return new EditorPropertyLine.Info(list, pti);
+                return EditorPropertyLine.CreateLineInfo(list, pti);
             }
             else
             {
-                return new TextBoxPropertyLine.Info(list, pti);
+                return TextBoxPropertyLine.CreateLineInfo(list, pti);
             }
         }
         else if (item is DesignerActionTextItem textItem)
         {
             if (item is DesignerActionHeaderItem)
             {
-                return new HeaderLine.Info(list, textItem);
+                return HeaderLine.CreateLineInfo(list, textItem);
             }
             else
             {
-                return new TextLine.Info(list, textItem);
+                return TextLine.CreateLineInfo(list, textItem);
             }
         }
         else

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,9 @@ protected override void OnValueChanged()`
`63`	`63`	`_checkBox.Checked = (bool)Value;`
`64`	`64`	`}`
`65`	`65`
`66`		`- public sealed class Info(DesignerActionList list, DesignerActionPropertyItem item) : PropertyLineInfo(list, item)`
	`66`	`+ public static StandardLineInfo CreateLineInfo(DesignerActionList list, DesignerActionPropertyItem item) => new Info(list, item);`
	`67`	`+`
	`68`	`+ private sealed class Info(DesignerActionList list, DesignerActionPropertyItem item) : PropertyLineInfo(list, item)`
`67`	`69`	`{`
`68`	`70`	`public override Line CreateLine(IServiceProvider serviceProvider, DesignerActionPanel actionPanel)`
`69`	`71`	`{`
Original file line number	Diff line number	Diff line change
`@@ -475,7 +475,9 @@ protected override bool ProcessDialogKey(Keys keyData)`
`475`	`475`	`}`
`476`	`476`	`}`
`477`	`477`
`478`		`- public new sealed class Info(DesignerActionList list, DesignerActionPropertyItem item) : PropertyLineInfo(list, item)`
	`478`	`+ public static new StandardLineInfo CreateLineInfo(DesignerActionList list, DesignerActionPropertyItem item) => new Info(list, item);`
	`479`	`+`
	`480`	`+ private sealed class Info(DesignerActionList list, DesignerActionPropertyItem item) : PropertyLineInfo(list, item)`
`479`	`481`	`{`
`480`	`482`	`public override Line CreateLine(IServiceProvider serviceProvider, DesignerActionPanel actionPanel)`
`481`	`483`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,10 @@ private HeaderLine(IServiceProvider serviceProvider, DesignerActionPanel actionP`
`15`	`15`
`16`	`16`	`protected override Font GetFont() => new(ActionPanel.Font, FontStyle.Bold);`
`17`	`17`
`18`		`- public new sealed class Info(DesignerActionList list, DesignerActionTextItem item) : StandardLineInfo(list)`
	`18`	`+ public static new StandardLineInfo CreateLineInfo(DesignerActionList list, DesignerActionTextItem item) => new HeaderTextLineInfo(list, item);`
	`19`	`+`
	`20`	`+ private sealed class HeaderTextLineInfo(DesignerActionList list, DesignerActionTextItem item) : TextLineInfo(list, item)`
`19`	`21`	`{`
`20`		`- public override DesignerActionTextItem Item { get; } = item;`
`21`	`22`	`public override Line CreateLine(IServiceProvider serviceProvider, DesignerActionPanel actionPanel)`
`22`	`23`	`{`
`23`	`24`	`return new HeaderLine(serviceProvider, actionPanel);`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,8 @@ protected override bool ProcessDialogKey(Keys keyData)`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
`113`		`- public sealed class Info(DesignerActionList list, DesignerActionMethodItem item) : StandardLineInfo(list)`
	`113`	`+ public static StandardLineInfo CreateLineInfo(DesignerActionList list, DesignerActionMethodItem item) => new Info(list, item);`
	`114`	`+ private sealed class Info(DesignerActionList list, DesignerActionMethodItem item) : StandardLineInfo(list)`
`114`	`115`	`{`
`115`	`116`	`public override DesignerActionMethodItem Item { get; } = item;`
`116`	`117`	`public override Line CreateLine(IServiceProvider serviceProvider, DesignerActionPanel actionPanel)`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ internal sealed override void UpdateActionItem(LineInfo lineInfo, ToolTip toolTi`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`
`115`		`- public abstract class PropertyLineInfo(DesignerActionList list, DesignerActionPropertyItem item) : StandardLineInfo(list)`
	`115`	`+ protected abstract class PropertyLineInfo(DesignerActionList list, DesignerActionPropertyItem item) : StandardLineInfo(list)`
`116`	`116`	`{`
`117`	`117`	`public override DesignerActionPropertyItem Item { get; } = item;`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,9 @@ public EditorLabelAccessibleObject(EditorLabel owner)`
`359`	`359`	`}`
`360`	`360`	`}`
`361`	`361`
`362`		`- public sealed class Info(DesignerActionList list, DesignerActionPropertyItem item) : PropertyLineInfo(list, item)`
	`362`	`+ public static StandardLineInfo CreateLineInfo(DesignerActionList list, DesignerActionPropertyItem item) => new Info(list, item);`
	`363`	`+`
	`364`	`+ private sealed class Info(DesignerActionList list, DesignerActionPropertyItem item) : PropertyLineInfo(list, item)`
`363`	`365`	`{`
`364`	`366`	`public override Line CreateLine(IServiceProvider serviceProvider, DesignerActionPanel actionPanel)`
`365`	`367`	`{`
Original file line number	Diff line number	Diff line change
`@@ -63,15 +63,17 @@ protected virtual Font GetFont()`
`63`	`63`
`64`	`64`	`internal override void UpdateActionItem(LineInfo lineInfo, ToolTip toolTip, ref int currentTabIndex)`
`65`	`65`	`{`
`66`		`- Info info = (Info)lineInfo;`
`67`		`- _textItem = info.Item;`
	`66`	`+ TextLineInfo textLineInfo = (TextLineInfo)lineInfo;`
	`67`	`+ _textItem = textLineInfo.Item;`
`68`	`68`	`_label.Text = StripAmpersands(_textItem.DisplayName);`
`69`	`69`	`_label.Font = GetFont();`
`70`	`70`	`_label.TabIndex = currentTabIndex++;`
`71`	`71`	`toolTip.SetToolTip(_label, _textItem.Description);`
`72`	`72`	`}`
`73`	`73`
`74`		`- public sealed class Info(DesignerActionList list, DesignerActionTextItem item) : StandardLineInfo(list)`
	`74`	`+ public static StandardLineInfo CreateLineInfo(DesignerActionList list, DesignerActionTextItem item) => new TextLineInfo(list, item);`
	`75`	`+`
	`76`	`+ protected class TextLineInfo(DesignerActionList list, DesignerActionTextItem item) : StandardLineInfo(list)`
`75`	`77`	`{`
`76`	`78`	`public override DesignerActionTextItem Item { get; } = item;`
`77`	`79`	`public override Line CreateLine(IServiceProvider serviceProvider, DesignerActionPanel actionPanel)`
Original file line number	Diff line number	Diff line change
`@@ -661,7 +661,7 @@ private StandardLineInfo ProcessTaskItem(DesignerActionList list, DesignerAction`
`661`	`661`	`{`
`662`	`662`	`if (item is DesignerActionMethodItem methodItem)`
`663`	`663`	`{`
`664`		`- return new MethodLine.Info(list, methodItem);`
	`664`	`+ return MethodLine.CreateLineInfo(list, methodItem);`
`665`	`665`	`}`
`666`	`666`	`else if (item is DesignerActionPropertyItem pti)`
`667`	`667`	`{`
`@@ -675,37 +675,37 @@ private StandardLineInfo ProcessTaskItem(DesignerActionList list, DesignerAction`
`675`	`675`	`bool standardValuesSupported = pd.Converter.GetStandardValuesSupported(context);`
`676`	`676`	`if (pd.TryGetEditor(out UITypeEditor _))`
`677`	`677`	`{`
`678`		`- return new EditorPropertyLine.Info(list, pti);`
	`678`	`+ return EditorPropertyLine.CreateLineInfo(list, pti);`
`679`	`679`	`}`
`680`	`680`	`else if (pd.PropertyType == typeof(bool))`
`681`	`681`	`{`
`682`	`682`	`if (IsReadOnlyProperty(pd))`
`683`	`683`	`{`
`684`		`- return new TextBoxPropertyLine.Info(list, pti);`
	`684`	`+ return TextBoxPropertyLine.CreateLineInfo(list, pti);`
`685`	`685`	`}`
`686`	`686`	`else`
`687`	`687`	`{`
`688`		`- return new CheckBoxPropertyLine.Info(list, pti);`
	`688`	`+ return CheckBoxPropertyLine.CreateLineInfo(list, pti);`
`689`	`689`	`}`
`690`	`690`	`}`
`691`	`691`	`else if (standardValuesSupported)`
`692`	`692`	`{`
`693`		`- return new EditorPropertyLine.Info(list, pti);`
	`693`	`+ return EditorPropertyLine.CreateLineInfo(list, pti);`
`694`	`694`	`}`
`695`	`695`	`else`
`696`	`696`	`{`
`697`		`- return new TextBoxPropertyLine.Info(list, pti);`
	`697`	`+ return TextBoxPropertyLine.CreateLineInfo(list, pti);`
`698`	`698`	`}`
`699`	`699`	`}`
`700`	`700`	`else if (item is DesignerActionTextItem textItem)`
`701`	`701`	`{`
`702`	`702`	`if (item is DesignerActionHeaderItem)`
`703`	`703`	`{`
`704`		`- return new HeaderLine.Info(list, textItem);`
	`704`	`+ return HeaderLine.CreateLineInfo(list, textItem);`
`705`	`705`	`}`
`706`	`706`	`else`
`707`	`707`	`{`
`708`		`- return new TextLine.Info(list, textItem);`
	`708`	`+ return TextLine.CreateLineInfo(list, textItem);`
`709`	`709`	`}`
`710`	`710`	`}`
`711`	`711`	`else`