Update NRefactory

src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs

@@ -262,7 +262,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						return contextList.Result;
 					}
 					
-					foreach (var m in initializerResult.Item1.Type.GetMembers (m => m.IsPublic && (m.EntityType == EntityType.Property || m.EntityType == EntityType.Field))) {
+					foreach (var m in initializerResult.Item1.Type.GetMembers (m => !m.IsSynthetic && m.IsPublic && (m.EntityType == EntityType.Property || m.EntityType == EntityType.Field))) {
 						contextList.AddMember(m);
 					}
 					
@@ -314,7 +314,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					return null;
 				case '>':
 					if (!IsInsideDocComment()) {
-						if (offset > 2 && document.GetCharAt (offset - 2) == '-' && !IsInsideCommentStringOrDirective()) {
+						if (offset > 2 && document.GetCharAt(offset - 2) == '-' && !IsInsideCommentStringOrDirective()) {
 							return HandleMemberReferenceCompletion(GetExpressionBeforeCursor());
 						}
 						return null;
@@ -886,7 +886,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						if (n.Parent is ICSharpCode.NRefactory.CSharp.Attribute) {
 							nodes.Add(n.Parent);
 						}
-						var astResolver = CompletionContextProvider.GetResolver (csResolver, identifierStart.Unit);
+						var astResolver = CompletionContextProvider.GetResolver(csResolver, identifierStart.Unit);
 						astResolver.ApplyNavigator(new NodeListResolveVisitorNavigator(nodes));
 						try {
 							csResolver = astResolver.GetResolverStateBefore(n);
@@ -1281,7 +1281,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				var root = node;
 				while (root.Parent != null)
 					root = root.Parent;
-				var astResolver = CompletionContextProvider.GetResolver (state, root);
+				var astResolver = CompletionContextProvider.GetResolver(state, root);
 				foreach (var type in CreateFieldAction.GetValidTypes(astResolver, (Expression)node)) {
 					if (type.Kind == TypeKind.Enum) {
 						AddEnumMembers(wrapper, type, state);
@@ -1321,6 +1321,8 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			if (currentType != null) {
 				for (var ct = currentType; ct != null; ct = ct.DeclaringTypeDefinition) {
 					foreach (var nestedType in ct.NestedTypes) {
+						if (nestedType.IsSynthetic)
+							continue;
 						string name = nestedType.Name;
 						if (IsAttributeContext(node) && name.EndsWith("Attribute") && name.Length > "Attribute".Length) {
 							name = name.Substring(0, name.Length - "Attribute".Length);
@@ -1349,6 +1351,8 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 							if (member is IMethod && ((IMethod)member).FullName == "System.Object.Finalize") {
 								continue;
 							}
+							if (member.IsSynthetic)
+								continue;
 							if (member.EntityType == EntityType.Operator) {
 								continue;
 							}
@@ -1365,7 +1369,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						}
 						var declaring = def.DeclaringTypeDefinition;
 						while (declaring != null) {
-							foreach (var member in declaring.GetMembers (m => m.IsStatic)) {
+							foreach (var member in declaring.GetMembers (m => m.IsStatic && !m.IsSynthetic)) {
 								if (memberPred == null || memberPred(member)) {
 									wrapper.AddMember(member);
 								}
@@ -2147,6 +2151,8 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				var nr = (NamespaceResolveResult)resolveResult;
 				if (!(resolvedNode.Parent is UsingDeclaration || resolvedNode.Parent != null && resolvedNode.Parent.Parent is UsingDeclaration)) {
 					foreach (var cl in nr.Namespace.Types) {
+						if (cl.IsSynthetic)
+							continue;
 						string name = cl.Name;
 						if (hintType != null && hintType.Kind != TypeKind.Array && cl.Kind == TypeKind.Interface) {
 							continue;
@@ -2270,7 +2276,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				return;
 			}
 			string typeString = GetShortType(resolvedType, state);
-			completionList.AddEnumMembers (resolvedType, state, typeString);
+			completionList.AddEnumMembers(resolvedType, state, typeString);
 			DefaultCompletionString = typeString;
 		}
 		
@@ -2285,6 +2291,8 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				var namespaceContents = new CompletionDataWrapper(this);
 				
 				foreach (var cl in nr.Namespace.Types) {
+					if (cl.IsSynthetic)
+						continue;
 					IType addType = typePred != null ? typePred(cl) : cl;
 					if (addType != null)
 						namespaceContents.AddType(addType, addType.Name);
@@ -2385,6 +2393,8 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				
 				var filteredList = new List<IMember>();
 				foreach (var member in type.GetMembers ()) {
+					if (member.IsSynthetic)
+						continue;
 					if (member.EntityType == EntityType.Indexer || member.EntityType == EntityType.Operator || member.EntityType == EntityType.Constructor || member.EntityType == EntityType.Destructor) {
 						continue;
 					}
@@ -2435,7 +2445,9 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			}
 			
 			if (resolveResult is TypeResolveResult || includeStaticMembers) {
-				foreach (var nested in type.GetNestedTypes ()) {
+				foreach (var nested in type.GetNestedTypes (t => !t.IsSynthetic)) {
+					if (!lookup.IsAccessible(nested.GetDefinition(), isProtectedAllowed))
+						continue;
 					IType addType = typePred != null ? typePred(nested) : nested;
 					if (addType != null)
 						result.AddType(addType, addType.Name);
@@ -2866,13 +2878,13 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 		}
 			);
 		
-		string GetLastClosingXmlCommentTag ()
+		string GetLastClosingXmlCommentTag()
 		{
 			var line = document.GetLineByNumber(location.Line);
 			
 			restart:
 			string lineText = document.GetText(line);
-			if (!lineText.Trim ().StartsWith ("///"))
+			if (!lineText.Trim().StartsWith("///"))
 				return null;
 			int startIndex = Math.Min(location.Column - 1, lineText.Length - 1) - 1;
 			while (startIndex > 0 && lineText [startIndex] != '<') {
@@ -2906,7 +2918,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 		
 		IEnumerable<ICompletionData> GetXmlDocumentationCompletionData()
 		{
-			var closingTag = GetLastClosingXmlCommentTag ();
+			var closingTag = GetLastClosingXmlCommentTag();
 			if (closingTag != null) {
 				yield return factory.CreateLiteralCompletionData(
 					"/" + closingTag + ">"

src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ImplementInterfaceAction.cs

@@ -1,4 +1,4 @@
-// 
+// 
 // ImplementInterfaceAction.cs
 //  
 // Author:
@@ -68,7 +68,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			foreach (var member in toImplement) {
 				if (!nodes.ContainsKey(member.Item1.DeclaringType)) 
 					nodes [member.Item1.DeclaringType] = new List<AstNode>();
-				nodes [member.Item1.DeclaringType].Add(GenerateMemberImplementation(context, member));
+				nodes [member.Item1.DeclaringType].Add(GenerateMemberImplementation(context, member.Item1, member.Item2));
 			}
 			
 			foreach (var kv in nodes) {
@@ -89,188 +89,21 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			}
 		}
 		
-		static AstNode GenerateMemberImplementation(RefactoringContext context, Tuple<IMember, bool> member)
-		{
-			switch (member.Item1.EntityType) {
-				case EntityType.Property:
-					return GenerateProperty(context, (IProperty)member.Item1, member.Item2);
-				case EntityType.Indexer:
-					return GenerateIndexer(context, (IProperty)member.Item1, member.Item2);
-				case EntityType.Event:
-					return GenerateEvent(context, (IEvent)member.Item1, member.Item2);
-				case EntityType.Method:
-					return GenerateMethod(context, (IMethod)member.Item1, member.Item2);
-				default:
-					throw new ArgumentOutOfRangeException();
-			}
-		}
-		
-		static AstNode GenerateEvent(RefactoringContext context, IEvent evt, bool explicitImplementation)
-		{
-			if (!explicitImplementation) {
-				return new EventDeclaration() {
-					Modifiers = Modifiers.Public,
-					Name = evt.Name,
-					ReturnType = context.CreateShortType (evt.ReturnType)
-				};
-			}
-			return new CustomEventDeclaration() {
-				Name = evt.Name,
-				ReturnType = context.CreateShortType (evt.ReturnType),
-				PrivateImplementationType = context.CreateShortType(evt.DeclaringType),
-				AddAccessor = new Accessor {
-					Body = new BlockStatement() {
-						new ThrowStatement(new ObjectCreateExpression(context.CreateShortType("System", "NotImplementedException")))
-					}
-				},
-				RemoveAccessor = new Accessor {
-					Body = new BlockStatement() {
-						new ThrowStatement(new ObjectCreateExpression(context.CreateShortType("System", "NotImplementedException")))
-					}
-				}
-			};
-		}
-		
-		static AstNode GenerateProperty(RefactoringContext context, IProperty property, bool explicitImplementation)
-		{
-			var result = new PropertyDeclaration() {
-				Name = property.Name,
-				ReturnType = context.CreateShortType (property.ReturnType)
-			};
-			
-			if (!explicitImplementation) {
-				result.Modifiers = Modifiers.Public;
-			} else {
-				result.PrivateImplementationType = context.CreateShortType(property.DeclaringType);
-			}
-			
-			if (property.CanGet) {
-				if (property.DeclaringType.Kind != TypeKind.Interface) {
-					result.Getter = new Accessor() {
-						Body = new BlockStatement () {
-							new ThrowStatement(new ObjectCreateExpression(context.CreateShortType("System", "NotImplementedException")))
-						}
-					};
-				} else {
-					result.Getter = new Accessor();
-				}
-			}
-			if (property.CanSet) {
-				if (property.DeclaringType.Kind != TypeKind.Interface) {
-					result.Setter = new Accessor() {
-						Body = new BlockStatement () {
-							new ThrowStatement(new ObjectCreateExpression(context.CreateShortType("System", "NotImplementedException")))
-						}
-					};
-				} else {
-					result.Setter = new Accessor();
-				}
-			}
-			
-			return result;
-		}
-		
-		static AstNode GenerateIndexer(RefactoringContext context, IProperty indexer, bool explicitImplementation)
-		{
-			var result = new IndexerDeclaration() {
-				ReturnType = context.CreateShortType (indexer.ReturnType)
-			};
-			
-			if (!explicitImplementation) {
-				result.Modifiers = Modifiers.Public;
-			} else {
-				result.PrivateImplementationType = context.CreateShortType(indexer.DeclaringType);
-			}
-			
-			foreach (var p in indexer.Parameters) {
-				ParameterModifier modifier;
-				if (p.IsOut) {
-					modifier = ParameterModifier.Out;
-				} else if (p.IsRef) {
-					modifier = ParameterModifier.Ref;
-				} else if (p.IsParams) {
-					modifier = ParameterModifier.Params;
-				} else {
-					modifier = ParameterModifier.None;
-				}
-				result.Parameters.Add(new ParameterDeclaration(context.CreateShortType(p.Type), p.Name, modifier));
-			}
-			
-			if (indexer.CanGet) {
-				result.Getter = new Accessor() {
-					Body = new BlockStatement () {
-						new ThrowStatement(new ObjectCreateExpression(context.CreateShortType("System", "NotImplementedException")))
-					}
-				};
-			}
-			if (indexer.CanSet) {
-				result.Setter = new Accessor() {
-					Body = new BlockStatement () {
-						new ThrowStatement(new ObjectCreateExpression(context.CreateShortType("System", "NotImplementedException")))
-					}
-				};
-			}
-			return result;
-		}
-		
-		static AstNode GenerateMethod(RefactoringContext context, IMethod method, bool explicitImplementation)
+		static EntityDeclaration GenerateMemberImplementation(RefactoringContext context, IMember member, bool explicitImplementation)
 		{
-			var result = new MethodDeclaration() {
-				Name = method.Name,
-				ReturnType = context.CreateShortType (method.ReturnType),
-				Body = new BlockStatement() {
-					new ThrowStatement(new ObjectCreateExpression(context.CreateShortType("System", "NotImplementedException")))
-				}
-			};
-			
-			if (!explicitImplementation) {
-				result.Modifiers = Modifiers.Public;
+			var builder = context.CreateTypeSytemAstBuilder();
+			builder.GenerateBody = true;
+			builder.ShowConstantValues = !explicitImplementation;
+			builder.ShowTypeParameterConstraints = !explicitImplementation;
+			builder.UseCustomEvents = explicitImplementation;
+			var decl = builder.ConvertEntity(member);
+			if (explicitImplementation) {
+				decl.Modifiers = Modifiers.None;
+				decl.AddChild(builder.ConvertType(member.DeclaringType), EntityDeclaration.PrivateImplementationTypeRole);
 			} else {
-				result.PrivateImplementationType = context.CreateShortType(method.DeclaringType);
+				decl.Modifiers = Modifiers.Public;
 			}
-			
-			foreach (var typeParam in method.TypeParameters) {
-				result.TypeParameters.Add(new TypeParameterDeclaration(typeParam.Name));
-				
-				var constraint = new Constraint() {
-					TypeParameter = new SimpleType(typeParam.Name)
-				};
-				
-				if (typeParam.HasDefaultConstructorConstraint) {
-					constraint.BaseTypes.Add(new PrimitiveType("new"));
-				} else if (typeParam.HasReferenceTypeConstraint) {
-					constraint.BaseTypes.Add(new PrimitiveType("class"));
-				} else if (typeParam.HasValueTypeConstraint) {
-					constraint.BaseTypes.Add(new PrimitiveType("struct"));
-				}
-				
-				foreach (var type in typeParam.DirectBaseTypes) {
-					if (type.FullName == "System.Object")
-						continue;
-					if (type.FullName == "System.ValueType")
-						continue;
-					constraint.BaseTypes.Add(context.CreateShortType(type));
-				}
-				if (constraint.BaseTypes.Count == 0)
-					continue;
-				result.Constraints.Add(constraint);
-			}
-			
-			foreach (var p in method.Parameters) {
-				ParameterModifier modifier;
-				if (p.IsOut) {
-					modifier = ParameterModifier.Out;
-				} else if (p.IsRef) {
-					modifier = ParameterModifier.Ref;
-				} else if (p.IsParams) {
-					modifier = ParameterModifier.Params;
-				} else {
-					modifier = ParameterModifier.None;
-				}
-				result.Parameters.Add(new ParameterDeclaration(context.CreateShortType(p.Type), p.Name, modifier));
-			}
-			
-			return result;
+			return decl;
 		}
 		
 		public static List<Tuple<IMember, bool>> CollectMembersToImplement(ITypeDefinition implementingType, IType interfaceType, bool explicitly)

src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/RefactoringContext.cs

@@ -45,23 +45,22 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 
 		public abstract TextLocation Location { get; }
 		
-		public virtual AstType CreateShortType (IType fullType)
+		public TypeSystemAstBuilder CreateTypeSytemAstBuilder()
 		{
 			var csResolver = Resolver.GetResolverStateBefore(GetNode());
-			var builder = new TypeSystemAstBuilder(csResolver);
-			return builder.ConvertType(fullType);
+			return new TypeSystemAstBuilder(csResolver);
 		}
 		
-		public AstType CreateShortType(string ns, string name, int typeParameterCount = 0)
+		public virtual AstType CreateShortType (IType fullType)
 		{
-			foreach (var asm in Compilation.Assemblies) {
-				var def = asm.GetTypeDefinition(ns, name, typeParameterCount);
-				if (def != null) {
-					return CreateShortType(def);
-				}
+			var builder = CreateTypeSytemAstBuilder();
+			return builder.ConvertType(fullType);
 		}
 		
-			return new MemberType(new SimpleType(ns), name);
+		public virtual AstType CreateShortType(string ns, string name, int typeParameterCount = 0)
+		{
+			var builder = CreateTypeSytemAstBuilder();
+			return builder.ConvertType(ns, name, typeParameterCount);
 		}
 
 		public virtual IEnumerable<AstNode> GetSelectedNodes()

src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/Script.cs

@@ -166,7 +166,11 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		{
 			// Default implementation: do nothing
 			// Derived classes are supposed to enter the text editor's linked state.
-			return null;
+			
+			// Immediately signal the task as completed:
+			var tcs = new TaskCompletionSource<object>();
+			tcs.SetResult(null);
+			return tcs.Task;
 		}
 		
 		public void Replace (AstNode node, AstNode replaceWith)

src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/TypeSystemAstBuilder.cs

@@ -111,6 +111,18 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		/// The default value is <c>false</c>.
 		/// </summary>
 		public bool AlwaysUseShortTypeNames { get; set; }
+		
+		/// <summary>
+		/// Controls whether to generate a body that throws a <c>System.NotImplementedException</c>.
+		/// The default value is <c>false</c>.
+		/// </summary>
+		public bool GenerateBody { get; set; }
+		
+		/// <summary>
+		/// Controls whether to generate custom events.
+		/// The default value is <c>false</c>.
+		/// </summary>
+		public bool UseCustomEvents { get; set; }
 		#endregion
 		
 		#region Convert Type
@@ -124,6 +136,19 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			return astType;
 		}
 		
+		public AstType ConvertType(string ns, string name, int typeParameterCount = 0)
+		{
+			if (resolver != null) {
+				foreach (var asm in resolver.Compilation.Assemblies) {
+					var def = asm.GetTypeDefinition(ns, name, typeParameterCount);
+					if (def != null) {
+						return ConvertType(def);
+					}
+				}
+			}
+			return new MemberType(new SimpleType(ns), name);
+		}
+		
 		AstType ConvertTypeHelper(IType type)
 		{
 			TypeWithElementType typeWithElementType = type as TypeWithElementType;
@@ -557,12 +582,24 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			return decl;
 		}
 		
+		BlockStatement GenerateBodyBlock()
+		{
+			if (GenerateBody) {
+				return new BlockStatement {
+					new ThrowStatement(new ObjectCreateExpression(ConvertType("System", "NotImplementedException")))
+				};
+			} else {
+				return BlockStatement.Null;
+			}
+		}
+		
 		Accessor ConvertAccessor(IMethod accessor)
 		{
 			if (accessor == null)
 				return Accessor.Null;
 			Accessor decl = new Accessor();
 			decl.Modifiers = ModifierFromAccessibility(accessor.Accessibility);
+			decl.Body = GenerateBodyBlock();
 			return decl;
 		}
 		
@@ -590,14 +627,24 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			return decl;
 		}
 		
-		EventDeclaration ConvertEvent(IEvent ev)
+		EntityDeclaration ConvertEvent(IEvent ev)
 		{
+			if (this.UseCustomEvents) {
+				CustomEventDeclaration decl = new CustomEventDeclaration();
+				decl.Modifiers = GetMemberModifiers(ev);
+				decl.ReturnType = ConvertType(ev.ReturnType);
+				decl.Name = ev.Name;
+				decl.AddAccessor    = ConvertAccessor(ev.AddAccessor);
+				decl.RemoveAccessor = ConvertAccessor(ev.RemoveAccessor);
+				return decl;
+			} else {
 				EventDeclaration decl = new EventDeclaration();
 				decl.Modifiers = GetMemberModifiers(ev);
 				decl.ReturnType = ConvertType(ev.ReturnType);
 				decl.Variables.Add(new VariableInitializer(ev.Name));
 				return decl;
 			}
+		}
 		
 		MethodDeclaration ConvertMethod(IMethod method)
 		{
@@ -625,6 +672,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 						decl.Constraints.Add(constraint);
 				}
 			}
+			decl.Body = GenerateBodyBlock();
 			return decl;
 		}
 		
@@ -641,6 +689,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			foreach (IParameter p in op.Parameters) {
 				decl.Parameters.Add(ConvertParameter(p));
 			}
+			decl.Body = GenerateBodyBlock();
 			return decl;
 		}
 		
@@ -652,6 +701,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			foreach (IParameter p in ctor.Parameters) {
 				decl.Parameters.Add(ConvertParameter(p));
 			}
+			decl.Body = GenerateBodyBlock();
 			return decl;
 		}
 		
@@ -659,6 +709,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		{
 			DestructorDeclaration decl = new DestructorDeclaration();
 			decl.Name = dtor.DeclaringTypeDefinition.Name;
+			decl.Body = GenerateBodyBlock();
 			return decl;
 		}
 		#endregion
@@ -687,12 +738,13 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		
 		Modifiers GetMemberModifiers(IMember member)
 		{
-			Modifiers m = ModifierFromAccessibility(member.Accessibility);
+			bool isInterfaceMember = member.DeclaringType.Kind == TypeKind.Interface;
+			Modifiers m = isInterfaceMember ? Modifiers.None : ModifierFromAccessibility(member.Accessibility);
 			if (this.ShowModifiers) {
 				if (member.IsStatic) {
 					m |= Modifiers.Static;
 				} else {
-					if (member.IsAbstract)
+					if (member.IsAbstract && !isInterfaceMember)
 						m |= Modifiers.Abstract;
 					if (member.IsOverride)
 						m |= Modifiers.Override;

src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/TypeSystem/CSharpAssembly.cs

@@ -290,6 +290,10 @@ namespace ICSharpCode.NRefactory.CSharp.TypeSystem
 				get { return assembly.Compilation; }
 			}
 			
+			IEnumerable<IAssembly> INamespace.ContributingAssemblies {
+				get { return new [] { assembly }; }
+			}
+			
 			INamespace INamespace.GetChildNamespace(string name)
 			{
 				var nameComparer = assembly.compilation.NameComparer;

src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/TypeSystem/ResolvedUsingScope.cs

@@ -172,6 +172,10 @@ namespace ICSharpCode.NRefactory.CSharp.TypeSystem
 				get { return EmptyList<ITypeDefinition>.Instance; }
 			}
 			
+			IEnumerable<IAssembly> INamespace.ContributingAssemblies {
+				get { return EmptyList<IAssembly>.Instance; }
+			}
+			
 			ICompilation IResolved.Compilation {
 				get { return parentNamespace.Compilation; }
 			}

src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/ExtensionMethods.cs

@@ -92,7 +92,7 @@ namespace ICSharpCode.NRefactory.TypeSystem
 		}
 		#endregion
 		
-		#region IsOpen / IsUnbound
+		#region IsOpen / IsUnbound / IsKnownType
 		sealed class TypeClassificationVisitor : TypeVisitor
 		{
 			internal bool isOpen;
@@ -140,6 +140,16 @@ namespace ICSharpCode.NRefactory.TypeSystem
 				throw new ArgumentNullException("type");
 			return type is ITypeDefinition && type.TypeParameterCount > 0;
 		}
+		
+		/// <summary>
+		/// Gets whether the type is the specified known type.
+		/// For generic known types, this returns true any parameterization of the type (and also for the definition itself).
+		/// </summary>
+		public static bool IsKnownType(this IType type, KnownTypeCode knownType)
+		{
+			var def = type.GetDefinition();
+			return def != null && def.KnownTypeCode == knownType;
+		}
 		#endregion
 		
 		#region Import

src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/INamespace.cs

@@ -62,6 +62,11 @@ namespace ICSharpCode.NRefactory.TypeSystem
 		/// </summary>
 		IEnumerable<ITypeDefinition> Types { get; }
 		
+		/// <summary>
+		/// Gets the assemblies that contribute types to this namespace (or to child namespaces).
+		/// </summary>
+		IEnumerable<IAssembly> ContributingAssemblies { get; }
+		
 		/// <summary>
 		/// Gets a direct child namespace by its short name.
 		/// Returns null when the namespace cannot be found.

src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultUnresolvedAssembly.cs

@@ -378,6 +378,10 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 					get { return parentNamespace; }
 				}
 				
+				IEnumerable<IAssembly> INamespace.ContributingAssemblies {
+					get { return new [] { assembly }; }
+				}
+				
 				IEnumerable<INamespace> INamespace.ChildNamespaces {
 					get { return childNamespaces; }
 				}

src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/MergedNamespace.cs

@@ -20,7 +20,6 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Text;
 using ICSharpCode.NRefactory.Utils;
 
 namespace ICSharpCode.NRefactory.TypeSystem.Implementation
@@ -96,6 +95,10 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 			get { return compilation; }
 		}
 		
+		public IEnumerable<IAssembly> ContributingAssemblies {
+			get { return namespaces.SelectMany(ns => ns.ContributingAssemblies); }
+		}
+		
 		public IEnumerable<INamespace> ChildNamespaces {
 			get { return GetChildNamespaces().Values; }
 		}