Merge pull request #1502 from madrang/SafeHandle.CloseTestDispose
[mono.git] / mcs / class / System.Design / System.ComponentModel.Design.Serialization / CodeDomSerializerBase.cs
index 7e3c00051a31414b727fbaea25fbebf6609f640a..37a07439dc8c1525874742705feb9bedd0f28a96 100644 (file)
@@ -27,7 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System;
 using System.Collections;
@@ -39,9 +38,27 @@ using System.CodeDom;
 
 namespace System.ComponentModel.Design.Serialization
 {
+       [EditorBrowsable (EditorBrowsableState.Never)]
        public abstract class CodeDomSerializerBase
        {
 
+               // MSDN says that if the deserialization fails a CodeExpression is returned
+               //
+               private sealed class DeserializationErrorMarker : CodeExpression
+               {
+                       public override bool Equals (object o)
+                       {
+                               return false;
+                       }
+
+                       public override int GetHashCode ()
+                       {
+                               return base.GetHashCode ();
+                       }
+               }
+
+               private static readonly DeserializationErrorMarker _errorMarker = new DeserializationErrorMarker ();
+
                internal CodeDomSerializerBase ()
                {
                }
@@ -87,9 +104,8 @@ namespace System.ComponentModel.Design.Serialization
                                        }
                                        if (expression == null && instance != null)
                                                expression = this.GetExpression (manager, instance); // 4
-
-                                       if (expression == null)
-                                               Console.WriteLine ("SerializeToExpression: " + instance + " failed.");
+                               } else {
+                                       ReportError (manager, "No serializer found for type '" + instance.GetType ().Name + "'");
                                }
                        }
                        return expression;
@@ -157,7 +173,7 @@ namespace System.ComponentModel.Design.Serialization
                                        expression = context.Expression;
                        }
 
-                       if (expression == null) { // 3rd try: IReferenceService (instnace.property.property.property
+                       if (expression == null) { // 3rd try: IReferenceService (instance.property.property.property
                                string name = manager.GetName (instance);
                                if (name == null || name.IndexOf (".") == -1) {
                                        IReferenceService service = manager.GetService (typeof (IReferenceService)) as IReferenceService;
@@ -237,13 +253,17 @@ namespace System.ComponentModel.Design.Serialization
                        if (converter != null && converter.CanConvertTo (typeof (InstanceDescriptor))) {
                                InstanceDescriptor descriptor = converter.ConvertTo (value, typeof (InstanceDescriptor)) as InstanceDescriptor;
                                isComplete = descriptor.IsComplete;
-                               expression = this.SerializeInstanceDescriptor (manager, descriptor);
+                               if (descriptor != null && descriptor.MemberInfo != null)
+                                       expression = this.SerializeInstanceDescriptor (manager, descriptor);
+                               else
+                                       ReportError (manager, "Unable to serialize to InstanceDescriptor", 
+                                                    "Value Type: " + value.GetType ().Name + System.Environment.NewLine + 
+                                                    "Value (ToString): " + value.ToString ());
                        } else {
-                               expression = new CodeObjectCreateExpression (value.GetType ().FullName, new CodeExpression[0]);
+                               if (value.GetType().GetConstructor (Type.EmptyTypes) != null)
+                                       expression = new CodeObjectCreateExpression (value.GetType ().FullName, new CodeExpression[0]);
                                isComplete = false;
                        }
-                       if (value.GetType ().Name.EndsWith ("Color"))
-                               Console.WriteLine ("SerializeCreationExpression: " + expression);
                        return expression;
                }
 
@@ -259,17 +279,13 @@ namespace System.ComponentModel.Design.Serialization
                                expression = new CodeFieldReferenceExpression (target, member.Name);
                        } else if (member is MethodInfo) {
                                CodeMethodInvokeExpression methodInvoke = new CodeMethodInvokeExpression (target, member.Name);
-                               manager.Context.Push (new ExpressionContext (methodInvoke, methodInvoke.GetType (), null, null));
                                if (descriptor.Arguments != null && descriptor.Arguments.Count > 0)
                                        methodInvoke.Parameters.AddRange (SerializeParameters (manager, descriptor.Arguments));
-                               manager.Context.Pop ();
                                expression = methodInvoke;
                        } else if (member is ConstructorInfo) {
                                CodeObjectCreateExpression createExpr = new CodeObjectCreateExpression (member.DeclaringType);
-                               manager.Context.Push (new ExpressionContext (createExpr, createExpr.GetType (), null, null));
                                if (descriptor.Arguments != null && descriptor.Arguments.Count > 0)
                                        createExpr.Parameters.AddRange (SerializeParameters (manager, descriptor.Arguments));
-                               manager.Context.Pop ();
                                expression = createExpr;
                        }
 
@@ -293,7 +309,7 @@ namespace System.ComponentModel.Design.Serialization
                }
 
                protected void SerializeEvent (IDesignerSerializationManager manager, CodeStatementCollection statements, 
-                                                                          object value, EventDescriptor descriptor) 
+                                              object value, EventDescriptor descriptor) 
                {
                        if (descriptor == null)
                                throw new ArgumentNullException ("descriptor");
@@ -310,7 +326,7 @@ namespace System.ComponentModel.Design.Serialization
                }
 
                protected void SerializeEvents (IDesignerSerializationManager manager, CodeStatementCollection statements, 
-                                                                               object value, params Attribute[] filter)
+                                               object value, params Attribute[] filter)
                {
                        if (filter == null)
                                throw new ArgumentNullException ("filter");
@@ -326,7 +342,8 @@ namespace System.ComponentModel.Design.Serialization
                                this.SerializeEvent (manager, statements, value, e);
                }
 
-               protected void SerializeProperty (IDesignerSerializationManager manager, CodeStatementCollection statements, object value, PropertyDescriptor propertyToSerialize)
+               protected void SerializeProperty (IDesignerSerializationManager manager, CodeStatementCollection statements, 
+                                                 object value, PropertyDescriptor propertyToSerialize)
                {
                        if (propertyToSerialize == null)
                                throw new ArgumentNullException ("propertyToSerialize");
@@ -337,7 +354,8 @@ namespace System.ComponentModel.Design.Serialization
                        if (manager == null)
                                throw new ArgumentNullException ("manager");
 
-                       MemberCodeDomSerializer serializer = manager.GetSerializer (propertyToSerialize.GetType (), typeof (MemberCodeDomSerializer)) as MemberCodeDomSerializer;
+                       MemberCodeDomSerializer serializer = manager.GetSerializer (propertyToSerialize.GetType (), 
+                                                                                   typeof (MemberCodeDomSerializer)) as MemberCodeDomSerializer;
                        if (serializer != null && serializer.ShouldSerialize (manager, value, propertyToSerialize))
                                serializer.Serialize (manager, value, propertyToSerialize, statements);
                }
@@ -355,12 +373,14 @@ namespace System.ComponentModel.Design.Serialization
                                throw new ArgumentNullException ("manager");
 
                        PropertyDescriptorCollection properties = TypeDescriptor.GetProperties (value, filter);
-                       foreach (PropertyDescriptor property in properties)
-                               this.SerializeProperty (manager, statements, value, property);
+                       foreach (PropertyDescriptor property in properties) {
+                               if (!property.Attributes.Contains (DesignerSerializationVisibilityAttribute.Hidden))
+                                       this.SerializeProperty (manager, statements, value, property);
+                       }
                }
 
                protected virtual object DeserializeInstance (IDesignerSerializationManager manager, Type type, 
-                                                                                                         object[] parameters, string name, bool addToContainer)
+                                                             object[] parameters, string name, bool addToContainer)
                {
                        if (type == null)
                                throw new ArgumentNullException ("type");
@@ -395,6 +415,7 @@ namespace System.ComponentModel.Design.Serialization
                        if (manager == null)
                                throw new ArgumentNullException ("manager");
 
+                       bool errorOccurred = false;
                        object deserialized = null;
 
                        // CodeThisReferenceExpression
@@ -413,16 +434,35 @@ namespace System.ComponentModel.Design.Serialization
                        
                        // CodeVariableReferenceExpression
                        //
-
                        CodeVariableReferenceExpression varRef = expression as CodeVariableReferenceExpression;
-                       if (deserialized == null && varRef != null)
-                                       deserialized = manager.GetInstance (varRef.VariableName);
+                       if (deserialized == null && varRef != null) {
+                               deserialized = manager.GetInstance (varRef.VariableName);
+                               if (deserialized == null) {
+                                       ReportError (manager, "Variable '" + varRef.VariableName + "' not initialized prior to reference");
+                                       errorOccurred = true;
+                               }
+                       }
 
-                       // CodeFieldReferenceExpression
+                       // CodeFieldReferenceExpression (used for Enum references as well)
                        //
                        CodeFieldReferenceExpression fieldRef = expression as CodeFieldReferenceExpression;
-                       if (deserialized == null && fieldRef != null)
+                       if (deserialized == null && fieldRef != null) {
                                deserialized = manager.GetInstance (fieldRef.FieldName);
+                               if (deserialized == null) {
+                                       object fieldHolder = DeserializeExpression (manager, null, fieldRef.TargetObject);
+                                       FieldInfo field = null;
+                                       if (fieldHolder is Type) // static field
+                                               field = ((Type)fieldHolder).GetField (fieldRef.FieldName, 
+                                                                                     BindingFlags.GetField | BindingFlags.Public | BindingFlags.Static);
+                                       else // instance field
+                                               field = fieldHolder.GetType().GetField (fieldRef.FieldName, 
+                                                                                       BindingFlags.GetField | BindingFlags.Public | BindingFlags.Instance);
+                                       if (field != null)
+                                               deserialized = field.GetValue (fieldHolder);
+                               }
+                               if (deserialized == null)
+                                       ReportError (manager, "Field '" + fieldRef.FieldName + "' not initialized prior to reference");
+                       }
                                
 
                        // CodePrimitiveExpression
@@ -433,23 +473,47 @@ namespace System.ComponentModel.Design.Serialization
 
                        // CodePropertyReferenceExpression
                        //
-                       // Enum references are represented by a PropertyReferenceExpression, where 
-                       // PropertyName is the enum field name and the target object is a TypeReference
-                       // to the enum's type
-                       //
                        CodePropertyReferenceExpression propRef = expression as CodePropertyReferenceExpression;
                        if (deserialized == null && propRef != null) {
                                object target = DeserializeExpression (manager, null, propRef.TargetObject);
-                               if (target != null) {
-                                       if (target is Type) { // Enum reference
+                               if (target != null && target != _errorMarker) {
+                                       bool found = false;
+                                       if (target is Type) {
+                                               PropertyInfo property = ((Type)target).GetProperty (propRef.PropertyName,
+                                                                                                   BindingFlags.GetProperty | 
+                                                                                                   BindingFlags.Public | BindingFlags.Static);
+                                               if (property != null) {
+                                                       deserialized = property.GetValue (null, null);
+                                                       found = true;
+                                               }
+
+                                               // NRefactory seems to produce PropertyReferences to reference some fields and enums
+                                               //
                                                FieldInfo field = ((Type)target).GetField (propRef.PropertyName,
-                                                                                                                                       BindingFlags.GetField | BindingFlags.Public | BindingFlags.Static);
-                                               if (field != null)
+                                                                                          BindingFlags.GetField | BindingFlags.Public | BindingFlags.Static);
+                                               if (field != null) {
                                                        deserialized = field.GetValue (null);
+                                                       found = true;
+                                               }
                                        } else {
                                                PropertyDescriptor property = TypeDescriptor.GetProperties (target)[propRef.PropertyName];
-                                               if (property != null)
+                                               if (property != null) {
                                                        deserialized = property.GetValue (target);
+                                                       found = true;
+                                               }
+
+                                               FieldInfo field = target.GetType().GetField (propRef.PropertyName,
+                                                                                            BindingFlags.GetField | BindingFlags.Public | BindingFlags.Instance);
+                                               if (field != null) {
+                                                       deserialized = field.GetValue (null);
+                                                       found = true;
+                                               }
+                                       }
+                                       
+                                       if (!found) {
+                                               ReportError (manager, "Missing field '" + propRef.PropertyName + " 'in type " + 
+                                                            (target is Type ? ((Type)target).Name : target.GetType ().Name) + "'");
+                                               errorOccurred = true;
                                        }
                                }
                        }
@@ -459,13 +523,43 @@ namespace System.ComponentModel.Design.Serialization
                        CodeObjectCreateExpression createExpr = expression as CodeObjectCreateExpression;
                        if (deserialized == null && createExpr != null) {
                                Type type = manager.GetType (createExpr.CreateType.BaseType);
-                               object[] arguments = new object[createExpr.Parameters.Count];
-                               for (int i=0; i < createExpr.Parameters.Count; i++)
-                                       arguments[i] = this.DeserializeExpression (manager, null, createExpr.Parameters[i]);
-                               bool addToContainer = false;
-                               if (typeof(IComponent).IsAssignableFrom (type))
-                                       addToContainer = true;
-                               deserialized = this.DeserializeInstance (manager, type, arguments, name, addToContainer);
+                               if (type == null) {
+                                       ReportError (manager, "Type '" + createExpr.CreateType.BaseType + "' not found." + 
+                                                    "Are you missing a reference?");
+                                       errorOccurred = true;
+                               } else {
+                                       object[] arguments = new object[createExpr.Parameters.Count];
+                                       for (int i=0; i < createExpr.Parameters.Count; i++) {
+                                               arguments[i] = this.DeserializeExpression (manager, null, createExpr.Parameters[i]);
+                                               if (arguments[i] == _errorMarker) {
+                                                       errorOccurred = true;
+                                                       break;
+                                               }
+                                       }
+                                       if (!errorOccurred) {
+                                               bool addToContainer = false;
+                                               if (typeof(IComponent).IsAssignableFrom (type))
+                                                       addToContainer = true;
+                                               deserialized = this.DeserializeInstance (manager, type, arguments, name, addToContainer);
+                                               if (deserialized == _errorMarker || deserialized == null) {
+                                                       string info = "Type to create: " + createExpr.CreateType.BaseType + System.Environment.NewLine +
+                                                               "Name: " + name + System.Environment.NewLine +
+                                                               "addToContainer: " + addToContainer.ToString () + System.Environment.NewLine +
+                                                               "Parameters Count: " + createExpr.Parameters.Count + System.Environment.NewLine;
+       
+                                                       for (int i=0; i < arguments.Length; i++) {
+                                                               info += "Parameter Number: " + i.ToString () + System.Environment.NewLine +
+                                                                       "Parameter Type: " + (arguments[i] == null ? "null" : arguments[i].GetType ().Name) +
+                                                                       System.Environment.NewLine +
+                                                                       "Parameter '" + i.ToString () + "' Value: " + arguments[i].ToString () + System.Environment.NewLine;
+                                                       }
+                                                       ReportError (manager, 
+                                                                    "Unable to create an instance of type '" + createExpr.CreateType.BaseType + "'",
+                                                                    info);
+                                                       errorOccurred = true;
+                                               }
+                                       }
+                               }
                        }
 
                        // CodeArrayCreateExpression
@@ -473,13 +567,32 @@ namespace System.ComponentModel.Design.Serialization
                        CodeArrayCreateExpression arrayCreateExpr = expression as CodeArrayCreateExpression;
                        if (deserialized == null && arrayCreateExpr != null) {
                                Type arrayType = manager.GetType (arrayCreateExpr.CreateType.BaseType);
-                               if (arrayType != null) {
+                               if (arrayType == null) {
+                                       ReportError (manager, "Type '" + arrayCreateExpr.CreateType.BaseType + "' not found." + 
+                                                    "Are you missing a reference?");
+                                       errorOccurred = true;
+                               } else {
                                        ArrayList initializers = new ArrayList ();
-                                       foreach (CodeExpression initExpression in arrayCreateExpr.Initializers) {
-                                               initializers.Add (this.DeserializeExpression (manager, null, initExpression));
+                                       Type elementType = arrayType.GetElementType ();
+                                       deserialized = Array.CreateInstance (arrayType, arrayCreateExpr.Initializers.Count);
+                                       for (int i = 0; i < arrayCreateExpr.Initializers.Count; i++) {
+                                               object element = this.DeserializeExpression (manager, null, arrayCreateExpr.Initializers[i]);
+                                               errorOccurred = (element == _errorMarker);
+                                               if (!errorOccurred) {
+                                                       if (arrayType.IsInstanceOfType (element)) {
+                                                               initializers.Add (element);
+                                                       } else {
+                                                               ReportError (manager, 
+                                                                            "Array initializer element type incompatible with array type.",
+                                                                            "Array Type: " + arrayType.Name + System.Environment.NewLine +
+                                                                            "Array Element Type: " + elementType + System.Environment.NewLine +
+                                                                            "Initializer Type: " + (element == null ? "null" : element.GetType ().Name));
+                                                               errorOccurred = true;
+                                                       }
+                                               }
                                        }
-                                       deserialized = Array.CreateInstance (arrayType, initializers.Count);
-                                       initializers.CopyTo ((Array)deserialized, 0);
+                                       if (!errorOccurred)
+                                               initializers.CopyTo ((Array)deserialized, 0);
                                }
                        }
 
@@ -488,50 +601,146 @@ namespace System.ComponentModel.Design.Serialization
                        CodeMethodInvokeExpression methodExpr = expression as CodeMethodInvokeExpression;
                        if (deserialized == null && methodExpr != null) {
                                object target = this.DeserializeExpression (manager, null, methodExpr.Method.TargetObject);
-                               object[] parameters = new object[methodExpr.Parameters.Count];
-                               for (int i=0; i < methodExpr.Parameters.Count; i++)
-                                       parameters[i] = this.DeserializeExpression (manager, null, methodExpr.Parameters[i]);
-
-                               MethodInfo method = null;
-                               if (target is Type) {
-                                       method = GetExactMethod ((Type)target, methodExpr.Method.MethodName, 
-                                                                                        BindingFlags.InvokeMethod | BindingFlags.Public | BindingFlags.Static,
-                                                                                        parameters);
+                               object[] parameters = null;
+                               if (target == _errorMarker || target == null) {
+                                       errorOccurred = true;
                                } else {
-                                       method = GetExactMethod (target.GetType(), methodExpr.Method.MethodName, 
-                                                                                        BindingFlags.InvokeMethod | BindingFlags.Public | BindingFlags.Instance,
-                                                                                        parameters);
+                                       parameters = new object[methodExpr.Parameters.Count];
+                                       for (int i=0; i < methodExpr.Parameters.Count; i++) {
+                                               parameters[i] = this.DeserializeExpression (manager, null, methodExpr.Parameters[i]);
+                                               if (parameters[i] == _errorMarker) {
+                                                       errorOccurred = true;
+                                                       break;
+                                               }
+                                       }
                                }
 
-                               if (method == null)
-                                       Console.WriteLine ("DeserializeExpression: Unable to find method: " + methodExpr.Method.MethodName);
-                               else
-                                       deserialized = method.Invoke (target, parameters);
+                               if (!errorOccurred) {
+                                       MethodInfo method = null;
+                                       if (target is Type) {
+                                               method = GetExactMethod ((Type)target, methodExpr.Method.MethodName, 
+                                                                                                BindingFlags.InvokeMethod | BindingFlags.Public | BindingFlags.Static,
+                                                                                                parameters);
+                                       } else {
+                                               method = GetExactMethod (target.GetType(), methodExpr.Method.MethodName, 
+                                                                                                BindingFlags.InvokeMethod | BindingFlags.Public | BindingFlags.Instance,
+                                                                                                parameters);
+                                       }
+       
+                                       if (method != null) {
+                                               deserialized = method.Invoke (target, parameters);
+                                       } else {
+                                               string info = 
+                                                       "Method Name: " + methodExpr.Method.MethodName + System.Environment.NewLine +
+                                                       "Method is: " + (target is Type ? "static" : "instance") + System.Environment.NewLine +
+                                                       "Method Holder Type: " + (target is Type ? ((Type)target).Name : target.GetType ().Name) + System.Environment.NewLine +
+                                                       "Parameters Count: " + methodExpr.Parameters.Count + System.Environment.NewLine +
+                                                       System.Environment.NewLine;
+
+                                               for (int i = 0; i < parameters.Length; i++) {
+                                                       info += "Parameter Number: " + i.ToString () + System.Environment.NewLine +
+                                                               "Parameter Type: " + (parameters[i] == null ? "null" : parameters[i].GetType ().Name) +
+                                                               System.Environment.NewLine +
+                                                               "Parameter " + i.ToString () + " Value: " + parameters[i].ToString () + System.Environment.NewLine;
+                                               }
+                                               ReportError (manager, 
+                                                            "Method '" + methodExpr.Method.MethodName + "' missing in type '" + 
+                                                            (target is Type ? ((Type)target).Name : target.GetType ().Name + "'"),
+                                                            info);
+                                               errorOccurred = true;
+                                       }
+                               }
                        }
 
                        // CodeTypeReferenceExpression
                        //
                        CodeTypeReferenceExpression typeRef = expression as CodeTypeReferenceExpression;
-                       if (deserialized == null && typeRef != null)
+                       if (deserialized == null && typeRef != null) {
                                deserialized = manager.GetType (typeRef.Type.BaseType);
-                       
+                               if (deserialized == null) {
+                                       ReportError (manager, "Type '" + typeRef.Type.BaseType + "' not found." + 
+                                                    "Are you missing a reference?");
+                                       errorOccurred = true;
+                               }
+                       }
+
+                       // CodeCastExpression
+                       // 
+                       CodeCastExpression castExpr = expression as CodeCastExpression;
+                       if (deserialized == null && castExpr != null) {
+                               Type targetType = manager.GetType (castExpr.TargetType.BaseType);
+                               object instance = DeserializeExpression (manager, null, castExpr.Expression);
+                               if (instance != null && instance != _errorMarker && targetType != null) {
+                                       IConvertible convertible = instance as IConvertible;
+                                       if (convertible != null) {
+                                               try {
+                                                       instance = convertible.ToType (targetType, null);
+                                               } catch {
+                                                       errorOccurred = true;
+                                               }
+                                       } else {
+                                               errorOccurred = true;
+                                       }
+                                       if (errorOccurred) {
+                                               ReportError (manager, "Unable to convert type '" + instance.GetType ().Name + 
+                                                            "' to type '" + castExpr.TargetType.BaseType + "'",
+                                                            "Target Type: " + castExpr.TargetType.BaseType + System.Environment.NewLine +
+                                                            "Instance Type: " + (instance == null ? "null" : instance.GetType ().Name) + System.Environment.NewLine +
+                                                            "Instance Value: " + (instance == null ? "null" : instance.ToString()) + System.Environment.NewLine +
+                                                            "Instance is IConvertible: " + (instance is IConvertible).ToString());
+                                       }
+
+                                       deserialized = instance;
+                               }
+                       }
+
+
                        // CodeBinaryOperatorExpression
                        //
                        CodeBinaryOperatorExpression binOperator = expression as CodeBinaryOperatorExpression;
                        if (deserialized == null && binOperator != null) {
+                               string errorText = null;
+                               IConvertible left = null;
+                               IConvertible right = null;
                                switch (binOperator.Operator) {
                                        case CodeBinaryOperatorType.BitwiseOr:
-                                               IConvertible left = DeserializeExpression (manager, null, binOperator.Left) as IConvertible;
-                                               IConvertible right = DeserializeExpression (manager, null, binOperator.Right) as IConvertible;
-                                               if (left is Enum
+                                               left = DeserializeExpression (manager, null, binOperator.Left) as IConvertible;
+                                               right = DeserializeExpression (manager, null, binOperator.Right) as IConvertible;
+                                               if (left is Enum && right is Enum) {
                                                        deserialized = Enum.ToObject (left.GetType (), Convert.ToInt64 (left) | Convert.ToInt64 (right));
+                                               } else {
+                                                       errorText = "CodeBinaryOperatorType.BitwiseOr allowed only on Enum types";
+                                                       errorOccurred = true;
+                                               }
                                                break;
+                                       default:
+                                               errorText = "Unsupported CodeBinaryOperatorType: " + binOperator.Operator.ToString ();
+                                               errorOccurred = true;
+                                               break;
+                               }
+
+                               if (errorOccurred) {
+                                       string info = "BinaryOperator Type: " + binOperator.Operator.ToString() + System.Environment.NewLine +
+                                               "Left Type: " + (left == null ? "null" : left.GetType().Name) + System.Environment.NewLine +
+                                               "Left Value: " + (left == null ? "null" : left.ToString ()) + System.Environment.NewLine +
+                                               "Left Expression Type: " + binOperator.Left.GetType ().Name + System.Environment.NewLine +
+                                               "Right Type: " + (right == null ? "null" : right.GetType().Name) + System.Environment.NewLine +
+                                               "Right Value: " + (right == null ? "null" : right.ToString ()) + System.Environment.NewLine +
+                                               "Right Expression Type: " + binOperator.Right.GetType ().Name;
+                                       ReportError (manager, errorText, info);
                                }
                        }
 
-                       if (deserialized == null && methodExpr == null && primitiveExp == null)
-                               Console.WriteLine ("DeserializeExpression not supported for: " + expression);
 
+                       if (!errorOccurred) {
+                               if (deserialized == null && !(expression is CodePrimitiveExpression) && !(expression is CodeMethodInvokeExpression)) {
+                                       ReportError (manager, "Unsupported Expression Type: " + expression.GetType ().Name);
+                                       errorOccurred = true;
+                               }
+                       }
+
+                       if (errorOccurred)
+                               deserialized = _errorMarker;
                        return deserialized;
                }
 
@@ -540,7 +749,7 @@ namespace System.ComponentModel.Design.Serialization
                private MethodInfo GetExactMethod (Type type, string methodName, BindingFlags flags, ICollection argsCollection)
                {
                        object[] arguments = null;
-                       Type[] types = new Type[0];
+                       Type[] types = Type.EmptyTypes;
 
                        if (argsCollection != null) {
                                arguments = new object[argsCollection.Count];
@@ -565,24 +774,17 @@ namespace System.ComponentModel.Design.Serialization
                        if (manager == null)
                                throw new ArgumentNullException ("manager");
 
-                       bool deserialized = false;
-
                        // CodeAssignStatement
                        //
                        CodeAssignStatement assignment = statement as CodeAssignStatement;
-                       if (assignment != null) {
+                       if (assignment != null)
                                DeserializeAssignmentStatement (manager, assignment);
-                               deserialized = true;
-                       }
 
                        // CodeExpressionStatement
                        //
                        CodeExpressionStatement expression = statement as CodeExpressionStatement;
-                       if (expression != null) {
+                       if (expression != null)
                                this.DeserializeExpression (manager, null, expression.Expression);
-                               deserialized = true;
-                       }
-
 
                        // CodeAttachEventStatement
                        //
@@ -606,86 +808,140 @@ namespace System.ComponentModel.Design.Serialization
                                        methodName = methodRef.MethodName;
 
                                object component = DeserializeExpression (manager, null, attachStatement.Event.TargetObject);
-                               if (component != null) {
+                               if (component != null && component != _errorMarker && methodName != null) {
+                                       string error = null;
                                        EventDescriptor eventDescriptor = TypeDescriptor.GetEvents (component)[attachStatement.Event.EventName];
                                        if (eventDescriptor != null) {
                                                IEventBindingService service = manager.GetService (typeof (IEventBindingService)) as IEventBindingService;
-                                               if (service != null) {
+                                               if (service != null)
                                                        service.GetEventProperty (eventDescriptor).SetValue (component, methodName);
-                                                       deserialized = true;
-                                               }
+                                               else
+                                                       error = "IEventBindingService missing";
+                                       } else {
+                                               error = "No event '" + attachStatement.Event.EventName + 
+                                                       "' found in type '" + component.GetType ().Name + "'";
+                                       }
+
+                                       if (error != null) {
+                                               ReportError (manager, error, "Method Name: " + methodName + System.Environment.NewLine +
+                                                       "Event Name: " + attachStatement.Event.EventName + System.Environment.NewLine +
+                                                       "Listener Expression Type: " + methodRef.GetType ().Name + System.Environment.NewLine +
+                                                       "Event Holder Type: " + component.GetType ().Name + System.Environment.NewLine +
+                                                       "Event Holder Expression Type: " + attachStatement.Event.TargetObject.GetType ().Name);
                                        }
                                }
                        }
-
-                       if (!deserialized)
-                               Console.WriteLine ("DeserializeStatement not supported for: " + statement);
                }
 
                private void DeserializeAssignmentStatement (IDesignerSerializationManager manager, CodeAssignStatement statement)
                {
-                       bool deserialized = false;
                        CodeExpression leftExpr = statement.Left;
                        
                        // Assign to a Property
                        //
                        CodePropertyReferenceExpression propRef = leftExpr as CodePropertyReferenceExpression;
                        if (propRef != null) {
-                               object target = DeserializeExpression (manager, null, propRef.TargetObject);
-                               object value = DeserializeExpression (manager, null, statement.Right);
-                               if (target != null) {
-                                       PropertyDescriptor property = TypeDescriptor.GetProperties (target)[propRef.PropertyName];
+                               object propertyHolder = DeserializeExpression (manager, null, propRef.TargetObject);
+                               object value = null;
+                               if (propertyHolder != null && propertyHolder != _errorMarker)
+                                       value = DeserializeExpression (manager, null, statement.Right);
+
+                               if (value != null && value != _errorMarker && propertyHolder != null) {
+                                       PropertyDescriptor property = TypeDescriptor.GetProperties (propertyHolder)[propRef.PropertyName];
                                        if (property != null) {
-                                               try {
-                                                       property.SetValue (target, value);
-                                               } catch (Exception e) {
-                                                       // FIXME: This is just for testing on MSNET
-                                               }
-                                               deserialized = true;
+                                               property.SetValue (propertyHolder, value);
+                                       } else {
+                                               ReportError (manager, 
+                                                            "Missing property '" + propRef.PropertyName + 
+                                                            "' in type '" + propertyHolder.GetType ().Name + "'");
                                        }
                                }
                        }
                        
                        // Assign to a Field
                        // 
-                       // This will fail for fields defined during the serialization process.
-                       // 
                        CodeFieldReferenceExpression fieldRef = leftExpr as CodeFieldReferenceExpression;
-                       if (fieldRef != null) {
-                               object value = DeserializeExpression (manager, fieldRef.FieldName, statement.Right);
+                       if (fieldRef != null && fieldRef.FieldName != null) {
+                               // Note that if the Right expression is a CodeCreationExpression the component will be created in this call
+                               //
                                object fieldHolder = DeserializeExpression (manager, null, fieldRef.TargetObject);
-                               if (fieldHolder != null) {
-                                       FieldInfo field = null;
-                                       if (fieldHolder is Type) // static field
-                                               field = ((Type)fieldHolder).GetField (fieldRef.FieldName, 
-                                                                                                                               BindingFlags.GetField | BindingFlags.Public | BindingFlags.Static);
-                                       else // instance field
-                                               field = fieldHolder.GetType().GetField (fieldRef.FieldName, 
-                                                                                                                               BindingFlags.GetField | BindingFlags.Public | BindingFlags.Instance);
-                                       if (field != null) {
-                                               field.SetValue (fieldHolder, value);
-                                               deserialized = true;
+                               object value = null;
+                               if (fieldHolder != null && fieldHolder != _errorMarker)
+                                       value = DeserializeExpression (manager, fieldRef.FieldName, statement.Right);
+                               FieldInfo field = null;
+
+                               RootContext context = manager.Context[typeof (RootContext)] as RootContext;
+                               if (fieldHolder != null && fieldHolder != _errorMarker && value != _errorMarker) {
+                                       if (fieldRef.TargetObject is CodeThisReferenceExpression && context != null && context.Value == fieldHolder) {
+                                               // Do not deserialize the fields of the root component, because the root component type 
+                                               // is actually an instance of the its parent type, e.g: CustomControl : _UserControl_
+                                               // and thus it doesn't contain the fields. The trick is that once DeserializeExpression 
+                                               // is called on a CodeObjectCreateExpression the component is created and is added to the name-instance
+                                               // table.
+                                               // 
+                                       } else {
+                                               if (fieldHolder is Type) // static field
+                                                       field = ((Type)fieldHolder).GetField (fieldRef.FieldName, 
+                                                                                             BindingFlags.GetField | BindingFlags.Public | BindingFlags.Static);
+                                               else // instance field
+                                                       field = fieldHolder.GetType().GetField (fieldRef.FieldName, 
+                                                                                               BindingFlags.GetField | BindingFlags.Public | BindingFlags.Instance);
+                                               if (field != null)
+                                                       field.SetValue (fieldHolder, value);
+                                               else {
+                                                       ReportError (manager, "Field '" + fieldRef.FieldName + "' missing in type '" +
+                                                                    fieldHolder.GetType ().Name + "'",
+                                                                    "Field Name: " + fieldRef.FieldName + System.Environment.NewLine +
+                                                                    "Field is: " + (fieldHolder is Type ? "static" : "instance") + System.Environment.NewLine +
+                                                                    "Field Value: " + (value == null ? "null" : value.ToString()) + System.Environment.NewLine +
+                                                                    "Field Holder Type: " + fieldHolder.GetType ().Name + System.Environment.NewLine +
+                                                                    "Field Holder Expression Type: " + fieldRef.TargetObject.GetType ().Name);
+                                               }
                                        }
                                }
                        }
 
-                       if (!deserialized)
-                               Console.WriteLine ("DeserializeAssignmentStatement error: " + statement);
+                       // Assign to a Variable
+                       // 
+                       CodeVariableReferenceExpression varRef = leftExpr as CodeVariableReferenceExpression;
+                       if (varRef != null && varRef.VariableName != null) {
+                               object value = DeserializeExpression (manager, varRef.VariableName, statement.Right);
+                               // If .Right is not CodeObjectCreateExpression the instance won't be assigned a name, 
+                               // so do it ourselves
+                               if (value != _errorMarker && manager.GetName (value) == null)
+                                       manager.SetName (value, varRef.VariableName);
+                       }
                }
-               
+
+               internal void ReportError (IDesignerSerializationManager manager, string message)
+               {
+                       this.ReportError (manager, message, String.Empty);
+               }
+
+               internal void ReportError (IDesignerSerializationManager manager, string message, string details)
+               {
+                       try {
+                               throw new Exception (message);
+                       } catch (Exception e) {
+                               e.Data["Details"] = message + Environment.NewLine + Environment.NewLine + details;
+                               manager.ReportError (e);
+                       }
+               }
+
 #region Resource Serialization - TODO
                protected CodeExpression SerializeToResourceExpression (IDesignerSerializationManager manager, object value) 
                {
                        throw new NotImplementedException ();
                }
                
-               protected CodeExpression SerializeToResourceExpression (IDesignerSerializationManager manager, object value, bool ensureInvariant) 
+               protected CodeExpression SerializeToResourceExpression (IDesignerSerializationManager manager, object value, 
+                                                                       bool ensureInvariant) 
                {
                        throw new NotImplementedException ();
                }
                
                protected void SerializePropertiesToResources (IDesignerSerializationManager manager, CodeStatementCollection statements, 
-                                                                                                          object value, Attribute[] filter) 
+                                                              object value, Attribute[] filter) 
                {
                        throw new NotImplementedException ();
                }
@@ -707,4 +963,3 @@ namespace System.ComponentModel.Design.Serialization
 #endregion
        }
 }
-#endif