convertey check type to type system.

1 files changed, 16 insertions, 13 deletions

diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Gui/AspProjectDom.cs b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Gui/AspProjectDom.cs
index fd16f32a46..09e5815d3d 100644
--- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Gui/AspProjectDom.cs
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Gui/AspProjectDom.cs
@@ -27,6 +27,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.TypeSystem.Implementation;
+
 
 namespace MonoDevelop.AspNet.Gui
 {
@@ -45,22 +47,23 @@ namespace MonoDevelop.AspNet.Gui
 			this.info = info;
 		}
 		
-		ITypeDefinition constructedType = null;
+		CompoundTypeDefinition constructedType = null;
 		ITypeDefinition CheckType (ITypeDefinition type)
 		{
-// TODO: Type system conversion.
-//			if (type == null)
-//				return null;
-//			var cu =info.ParsedDocument.CompilationUnit;
-//			var firstType = cu.Types.FirstOrDefault ();
-//			if (type.IsPartial && firstType != null && firstType.FullName == type.FullName) {
-//				if (constructedType != null)
-//					return constructedType;
-//				constructedType = CompoundType.Merge (firstType, type);
-//				constructedType = CompoundType.Merge (constructedType, info.CodeBesideClass);
+			if (type == null)
+				return null;
+			var cu =info.ParsedDocument.CompilationUnit;
+			var firstType = cu.Types.FirstOrDefault ();
+			if (type.IsPartial && firstType != null && firstType.FullName == type.FullName) {
+				if (constructedType != null)
+					return constructedType;
+				constructedType = new CompoundTypeDefinition ();
+				constructedType.AddPart (firstType);
+				constructedType.AddPart (type);
+				constructedType.AddPart (info.CodeBesideClass);
 //				constructedType.GetProjectContent () = this;
-//				return constructedType;
-//			}
+				return constructedType;
+			}
 			return type;
 		}