Fixed completion bug.

ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs

@@ -1476,8 +1476,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 		{
 			if (curType == null)
 				return;
-			
-			foreach (var m in curType.GetMethods (m => !m.IsConstructor && !m.IsDestructor).Cast<IMember> ().Concat (curType.GetProperties ().Cast<IMember> ())) {
+			foreach (var m in curType.GetMethods (m => !m.IsConstructor && !m.IsDestructor).Cast<IMember> ().Concat (curType.GetProperties ().Cast<IMember> ()).Reverse ()) {
 				if (m.IsSynthetic || curType.Kind != TypeKind.Interface && !m.IsOverridable)
 					continue;
 				// filter out the "Finalize" methods, because finalizers should be done with destructors.
@@ -1491,7 +1490,8 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				bool foundMember = curType.GetMembers ().Any (cm => GetNameWithParamCount (cm) == text && cm.DeclaringTypeDefinition == curType.GetDefinition ());
 				if (foundMember)
 					continue;
-					
+				if (alreadyInserted.ContainsKey (text))
+					continue;
 				alreadyInserted [text] = true;
 				data.CompletionCategory = col.GetCompletionCategory (curType);
 				col.Add (data);
@@ -1800,9 +1800,29 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 			if (resolveResult is MemberResolveResult && resolvedNode is IdentifierExpression) {
 				var mrr = (MemberResolveResult)resolveResult;
 				includeStaticMembers = mrr.Member.Name == mrr.Type.Name;
+				
+				// ADD Aliases
+				var scope = CSharpParsedFile.GetUsingScope (location).Resolve (Compilation);
+			
+				for (var n = scope; n != null; n = n.Parent) {
+					foreach (var pair in n.UsingAliases) {
+						if (pair.Key == mrr.Member.Name) {
+							foreach (var r in CreateCompletionData (location, pair.Value, resolvedNode, state)) {
+								if (r is IEntityCompletionData && ((IEntityCompletionData)r).Entity is IMember) {
+									result.AddMember ((IMember)((IEntityCompletionData)r).Entity);
+								} else {
+									result.Add (r);
+								}
+							}
+						}
+					}
+				}				
+				
+				
 			}
-			if (resolveResult is TypeResolveResult && (resolvedNode is IdentifierExpression || resolvedNode is MemberReferenceExpression))
+			if (resolveResult is TypeResolveResult && (resolvedNode is IdentifierExpression || resolvedNode is MemberReferenceExpression)) {
 				includeStaticMembers = true;
+			}
 			
 //			Console.WriteLine ("type:" + type +"/"+type.GetType ());
 //			Console.WriteLine ("current:" + ctx.CurrentTypeDefinition);

ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionBugTests.cs

@@ -1822,6 +1822,54 @@ namespace Foobar
 			});
 		}
 		
+		/// <summary>
+		/// Bug 3371 - MD intellisense ignores namespace aliases
+		/// </summary>
+		[Test()]
+		public void TestBug3371 ()
+		{
+			CombinedProviderTest (
+@"namespace A
+{
+    using Base = B.Color;
+
+    class Color
+    {
+        protected Base Base
+        {
+            get { return Base.Blue; }
+        }
+
+        protected Base NewBase {
+            get {
+                $return Base.$
+            }
+        }
+
+        public static void Main ()
+        {
+        }
+    }
+}
+
+namespace B
+{
+    public struct Color
+    {
+        public static Color Blue = new Color ();
+
+        public static Color From (int i)
+        {
+            return new Color ();
+        }
+    }
+}
+", provider => {
+				Assert.IsNotNull (provider.Find ("Blue"), "'Blue' not found.");
+				Assert.IsNotNull (provider.Find ("From"), "'From' not found.");
+			});
+		}
+		
 		[Test()]
 		public void TestNewInConstructor ()
 		{