From b99b871ccbf1a388dd1061a9b8c2ce8a6bbe0ea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20Kr=C3=BCger?= <mkrueger@xamarin.com>
Date: Thu, 18 Oct 2012 17:13:46 +0200
Subject: [PATCH] Fixed duplicate type issue.

---
 .../Completion/CompletionDataWrapper.cs               | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ICSharpCode.NRefactory.CSharp/Completion/CompletionDataWrapper.cs b/ICSharpCode.NRefactory.CSharp/Completion/CompletionDataWrapper.cs
index c4eff72e6a..af3fdd5217 100644
--- a/ICSharpCode.NRefactory.CSharp/Completion/CompletionDataWrapper.cs
+++ b/ICSharpCode.NRefactory.CSharp/Completion/CompletionDataWrapper.cs
@@ -95,15 +95,13 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 		}
 
 		Dictionary<string, ICompletionData> typeDisplayText = new Dictionary<string, ICompletionData> ();
-		Dictionary<IType, ICompletionData> addedTypes = new Dictionary<IType, ICompletionData> ();
+		Dictionary<string, ICompletionData> addedTypes = new Dictionary<string, ICompletionData> ();
 		public ICompletionData AddType(IType type, bool showFullName, bool isInAttributeContext = false)
 		{
 			if (type == null)
 				throw new ArgumentNullException("type");
 			if (type.Name == "Void" && type.Namespace == "System" || type.Kind == TypeKind.Unknown)
 				return null;
-			if (addedTypes.ContainsKey (type))
-				return addedTypes[type];
 
 			var def = type.GetDefinition();
 			if (def != null && def.ParentAssembly != completion.ctx.CurrentAssembly && !def.IsBrowsable())
@@ -112,13 +110,18 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			var data = Factory.CreateTypeCompletionData(type, showFullName, isInAttributeContext);
 			var text = data.DisplayText;
 
+			var reflectionName = text + "~" + type.TypeParameterCount;
+			if (addedTypes.ContainsKey(reflectionName))
+				return addedTypes[reflectionName];
+
+
 			if (typeDisplayText.TryGetValue(text, out usedType)) {
 				usedType.AddOverload(data);
 				return usedType;
 			} 
 			typeDisplayText [text] = data;
 			result.Add(data);
-			addedTypes[type] = data;
+			addedTypes[reflectionName] = data;
 			return data;
 		}