Skip to content

Commit 2681167

Browse files
authored
Refactor DesignerSerializationManager to replace HashTable and enable Nullability (#8353)
* Refactored to remove HashTable Refactored for null-ability annotations General code cleanup * changes from review * changes from review * more changes * remove null check * rebase and minor refactor * change from review * Small refactor to remove null warning * added debug.assert check for instance * change from review * Fix test failure * Change `GetRuntimeType` back * Fix DesignerSerializationManager_Errors_GetWithSession_ReturnsExpected to check for IList instead of ArrayList * fix a couple more tests * Fix test failures of DesignerSerializationManager * changes from review * Fix SerializationProviders property
1 parent 4ff37d7 commit 2681167

File tree

3 files changed

+275
-253
lines changed

3 files changed

+275
-253
lines changed

src/System.Windows.Forms.Design/src/PublicAPI.Shipped.txt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -359,15 +359,15 @@ System.ComponentModel.Design.ProjectTargetFrameworkAttribute.TargetFrameworkMoni
359359
~System.ComponentModel.Design.Serialization.CodeDomSerializerException.CodeDomSerializerException(System.Exception ex, System.ComponentModel.Design.Serialization.IDesignerSerializationManager manager) -> void
360360
~System.ComponentModel.Design.Serialization.CodeDomSerializerException.LinePragma.get -> System.CodeDom.CodeLinePragma
361361
~System.ComponentModel.Design.Serialization.CollectionCodeDomSerializer.MethodSupportsSerialization(System.Reflection.MethodInfo method) -> bool
362-
~System.ComponentModel.Design.Serialization.DesignerSerializationManager.Container.get -> System.ComponentModel.IContainer
363-
~System.ComponentModel.Design.Serialization.DesignerSerializationManager.Container.set -> void
364-
~System.ComponentModel.Design.Serialization.DesignerSerializationManager.CreateSession() -> System.IDisposable
365-
~System.ComponentModel.Design.Serialization.DesignerSerializationManager.DesignerSerializationManager(System.IServiceProvider provider) -> void
366-
~System.ComponentModel.Design.Serialization.DesignerSerializationManager.Errors.get -> System.Collections.IList
367-
~System.ComponentModel.Design.Serialization.DesignerSerializationManager.GetRuntimeType(string typeName) -> System.Type
368-
~System.ComponentModel.Design.Serialization.DesignerSerializationManager.GetSerializer(System.Type objectType, System.Type serializerType) -> object
369-
~System.ComponentModel.Design.Serialization.DesignerSerializationManager.PropertyProvider.get -> object
370-
~System.ComponentModel.Design.Serialization.DesignerSerializationManager.PropertyProvider.set -> void
362+
System.ComponentModel.Design.Serialization.DesignerSerializationManager.Container.get -> System.ComponentModel.IContainer?
363+
System.ComponentModel.Design.Serialization.DesignerSerializationManager.Container.set -> void
364+
System.ComponentModel.Design.Serialization.DesignerSerializationManager.CreateSession() -> System.IDisposable!
365+
System.ComponentModel.Design.Serialization.DesignerSerializationManager.DesignerSerializationManager(System.IServiceProvider? provider) -> void
366+
System.ComponentModel.Design.Serialization.DesignerSerializationManager.Errors.get -> System.Collections.IList!
367+
System.ComponentModel.Design.Serialization.DesignerSerializationManager.GetRuntimeType(string? typeName) -> System.Type?
368+
System.ComponentModel.Design.Serialization.DesignerSerializationManager.GetSerializer(System.Type? objectType, System.Type! serializerType) -> object?
369+
System.ComponentModel.Design.Serialization.DesignerSerializationManager.PropertyProvider.get -> object?
370+
System.ComponentModel.Design.Serialization.DesignerSerializationManager.PropertyProvider.set -> void
371371
~System.ComponentModel.Design.Serialization.ExpressionContext.Expression.get -> System.CodeDom.CodeExpression
372372
~System.ComponentModel.Design.Serialization.ExpressionContext.ExpressionContext(System.CodeDom.CodeExpression expression, System.Type expressionType, object owner) -> void
373373
~System.ComponentModel.Design.Serialization.ExpressionContext.ExpressionContext(System.CodeDom.CodeExpression expression, System.Type expressionType, object owner, object presetValue) -> void
@@ -635,12 +635,12 @@ virtual System.ComponentModel.Design.DesignerCommandSet.GetCommands(string! name
635635
~virtual System.ComponentModel.Design.Serialization.CodeDomSerializer.SerializeMember(System.ComponentModel.Design.Serialization.IDesignerSerializationManager manager, object owningObject, System.ComponentModel.MemberDescriptor member) -> System.CodeDom.CodeStatementCollection
636636
~virtual System.ComponentModel.Design.Serialization.CodeDomSerializer.SerializeMemberAbsolute(System.ComponentModel.Design.Serialization.IDesignerSerializationManager manager, object owningObject, System.ComponentModel.MemberDescriptor member) -> System.CodeDom.CodeStatementCollection
637637
~virtual System.ComponentModel.Design.Serialization.CollectionCodeDomSerializer.SerializeCollection(System.ComponentModel.Design.Serialization.IDesignerSerializationManager manager, System.CodeDom.CodeExpression targetExpression, System.Type targetType, System.Collections.ICollection originalCollection, System.Collections.ICollection valuesToSerialize) -> object
638-
~virtual System.ComponentModel.Design.Serialization.DesignerSerializationManager.CreateInstance(System.Type type, System.Collections.ICollection arguments, string name, bool addToContainer) -> object
639-
~virtual System.ComponentModel.Design.Serialization.DesignerSerializationManager.GetService(System.Type serviceType) -> object
640-
~virtual System.ComponentModel.Design.Serialization.DesignerSerializationManager.GetType(string typeName) -> System.Type
641-
~virtual System.ComponentModel.Design.Serialization.DesignerSerializationManager.OnResolveName(System.ComponentModel.Design.Serialization.ResolveNameEventArgs e) -> void
642-
~virtual System.ComponentModel.Design.Serialization.DesignerSerializationManager.OnSessionCreated(System.EventArgs e) -> void
643-
~virtual System.ComponentModel.Design.Serialization.DesignerSerializationManager.OnSessionDisposed(System.EventArgs e) -> void
638+
virtual System.ComponentModel.Design.Serialization.DesignerSerializationManager.CreateInstance(System.Type! type, System.Collections.ICollection? arguments, string? name, bool addToContainer) -> object!
639+
virtual System.ComponentModel.Design.Serialization.DesignerSerializationManager.GetService(System.Type! serviceType) -> object?
640+
virtual System.ComponentModel.Design.Serialization.DesignerSerializationManager.GetType(string? typeName) -> System.Type?
641+
virtual System.ComponentModel.Design.Serialization.DesignerSerializationManager.OnResolveName(System.ComponentModel.Design.Serialization.ResolveNameEventArgs! e) -> void
642+
virtual System.ComponentModel.Design.Serialization.DesignerSerializationManager.OnSessionCreated(System.EventArgs! e) -> void
643+
virtual System.ComponentModel.Design.Serialization.DesignerSerializationManager.OnSessionDisposed(System.EventArgs! e) -> void
644644
~virtual System.ComponentModel.Design.Serialization.TypeCodeDomSerializer.Deserialize(System.ComponentModel.Design.Serialization.IDesignerSerializationManager manager, System.CodeDom.CodeTypeDeclaration declaration) -> object
645645
~virtual System.ComponentModel.Design.Serialization.TypeCodeDomSerializer.GetInitializeMethod(System.ComponentModel.Design.Serialization.IDesignerSerializationManager manager, System.CodeDom.CodeTypeDeclaration declaration, object value) -> System.CodeDom.CodeMemberMethod
646646
~virtual System.ComponentModel.Design.Serialization.TypeCodeDomSerializer.GetInitializeMethods(System.ComponentModel.Design.Serialization.IDesignerSerializationManager manager, System.CodeDom.CodeTypeDeclaration declaration) -> System.CodeDom.CodeMemberMethod[]
@@ -892,8 +892,8 @@ System.ComponentModel.Design.Serialization.DesignerSerializationManager.Preserve
892892
System.ComponentModel.Design.Serialization.DesignerSerializationManager.PreserveNames.set -> void
893893
System.ComponentModel.Design.Serialization.DesignerSerializationManager.RecycleInstances.get -> bool
894894
System.ComponentModel.Design.Serialization.DesignerSerializationManager.RecycleInstances.set -> void
895-
System.ComponentModel.Design.Serialization.DesignerSerializationManager.SessionCreated -> System.EventHandler
896-
System.ComponentModel.Design.Serialization.DesignerSerializationManager.SessionDisposed -> System.EventHandler
895+
System.ComponentModel.Design.Serialization.DesignerSerializationManager.SessionCreated -> System.EventHandler?
896+
System.ComponentModel.Design.Serialization.DesignerSerializationManager.SessionDisposed -> System.EventHandler?
897897
System.ComponentModel.Design.Serialization.DesignerSerializationManager.ValidateRecycledTypes.get -> bool
898898
System.ComponentModel.Design.Serialization.DesignerSerializationManager.ValidateRecycledTypes.set -> void
899899
System.ComponentModel.Design.Serialization.ExpressionContext

0 commit comments

Comments
 (0)