Merge remote-tracking branch 'upstream/master' into mansheng

ICSharpCode.NRefactory.CSharp/Ast/Expressions/PointerReferenceExpression.cs

@@ -49,7 +49,16 @@ namespace ICSharpCode.NRefactory.CSharp
 				return GetChildByRole (Roles.Identifier).Name;
 			}
 			set {
-				SetChildByRole(Roles.Identifier, Identifier.Create (value));
+				SetChildByRole(Roles.Identifier, Identifier.Create (value));
+			}
+		}
+		
+		public Identifier MemberNameToken {
+			get {
+				return GetChildByRole (Roles.Identifier);
+			}
+			set {
+				SetChildByRole (Roles.Identifier, value);
 			}
 		}
 		

ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs

@@ -2324,7 +2324,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					result.AddMember(field);
 				}
 				foreach (var m in type.GetMethods ()) {
-					if (m.Name == "TryParse") {
+					if (m.IsStatic && m.IsPublic) {
 						result.AddMember(m);
 					}
 				}

ICSharpCode.NRefactory.CSharp/Completion/CompletionDataWrapper.cs

@@ -80,6 +80,8 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 		{
 			if (type == null || string.IsNullOrEmpty(shortType) || usedTypes.Contains(shortType))
 				return null;
+			if (type.Name == "Void" && type.Namespace == "System")
+				return null;
 			usedTypes.Add(shortType);
 			var iCompletionData = Factory.CreateTypeCompletionData(type, shortType);
 			result.Add(iCompletionData);
@@ -90,6 +92,8 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 		{
 			if (type == null || string.IsNullOrEmpty(shortType) || usedTypes.Contains(shortType))
 				return null;
+			if (type.Name == "Void" && type.Namespace == "System")
+				return null;
 			usedTypes.Add(shortType);
 			var iCompletionData = Factory.CreateTypeCompletionData(type, shortType);
 			result.Add(iCompletionData);
@@ -134,7 +138,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 		{
 			var newData = Factory.CreateEntityCompletionData (member);
 			
-//				newData.HideExtensionParameter = HideExtensionParameter;
+			//				newData.HideExtensionParameter = HideExtensionParameter;
 			string memberKey = newData.DisplayText;
 			if (memberKey == null)
 				return null;
@@ -171,7 +175,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 		{
 			var newData = Factory.CreateEntityCompletionData (member);
 			
-//				newData.HideExtensionParameter = HideExtensionParameter;
+			//				newData.HideExtensionParameter = HideExtensionParameter;
 			string memberKey = newData.DisplayText;
 			if (memberKey == null)
 				return null;
@@ -254,8 +258,8 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					Result.Add(Factory.CreateEntityCompletionData(
 						field,
 						typeString + "." + field.Name
-					)
-					);
+						)
+					           );
 				}
 			}
 		}

ICSharpCode.NRefactory.CSharp/Resolver/CSharpResolver.cs

@@ -1618,7 +1618,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 					throw new NotSupportedException("Invalid value for NameLookupMode");
 			}
 			if (result is UnknownMemberResolveResult) {
-				var extensionMethods = GetExtensionMethods(identifier, typeArguments);
+				var extensionMethods = GetExtensionMethods(target.Type, identifier, typeArguments, true);
 				if (extensionMethods.Count > 0) {
 					return new MethodGroupResolveResult(target, identifier, EmptyList<MethodListWithDeclaringType>.Instance, typeArguments) {
 						extensionMethods = extensionMethods

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

@@ -592,7 +592,7 @@ class TestClass
 	}
 }");
 			Assert.IsNotNull (provider, "provider was not created.");
-			Assert.AreEqual (6, provider.Count);
+			Assert.IsTrue (provider.Count > 0);
 		}
 		
 		[Test()]

ICSharpCode.NRefactory/TypeSystem/CecilLoader.cs

@@ -1175,15 +1175,16 @@ namespace ICSharpCode.NRefactory.TypeSystem
 			public KeyValuePair<IMember, ResolveResult> ReadNamedArg(IType attributeType)
 			{
 				EntityType memberType;
-				switch (ReadByte()) {
-					case 0x53:
-						memberType = EntityType.Field;
-						break;
-					case 0x54:
-						memberType = EntityType.Property;
-						break;
-					default:
-						throw new NotSupportedException();
+				var b = ReadByte();
+				switch (b) {
+				case 0x53:
+					memberType = EntityType.Field;
+					break;
+				case 0x54:
+					memberType = EntityType.Property;
+					break;
+				default:
+					throw new NotSupportedException(string.Format("Custom member type 0x{0:x} is not supported.", b));
 				}
 				IType type = ReadCustomAttributeFieldOrPropType();
 				string name = ReadSerString();