Revert "Implemented reduced method model."

This reverts commit aaf2b919f5.

ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs

@@ -1,4 +1,4 @@
-// 
+// 
 // CSharpCompletionEngine.cs
 //  
 // Author:
@@ -2570,7 +2570,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 					foreach (var m in meths) {
 						if (!lookup.IsAccessible(m, isProtectedAllowed))
 							continue;
-						result.AddMember(new ReducedExtensionMethod (m));
+						result.AddMember(new InvocatedExtensionMethod (m));
 					}
 				}
 			}

ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj

@@ -512,7 +512,7 @@
     <Compile Include="Refactoring\CodeActions\CreateEnumValue.cs" />
     <Compile Include="Resolver\AliasTypeResolveResult.cs" />
     <Compile Include="Resolver\AliasNamespaceResolveResult.cs" />
-    <Compile Include="Resolver\ReducedExtensionMethod.cs" />
+    <Compile Include="Resolver\InvocatedExtensionMethod.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">

ICSharpCode.NRefactory.CSharp/Resolver/InvocatedExtensionMethod.cs

@@ -1,5 +1,5 @@
 //
-// ReducedExtensionMethod.cs
+// InvocatedExtensionMethod.cs
 //
 // Author:
 //       Mike Krüger <mkrueger@xamarin.com>
@@ -35,64 +35,26 @@ namespace ICSharpCode.NRefactory.CSharp
 	/// It's used to hide the internals of extension method invocation in certain situation to simulate the 
 	/// syntactic way of writing extension methods on semantic level.
 	/// </summary>
-	public class ReducedExtensionMethod : IMethod
+	public class InvocatedExtensionMethod : IMethod
 	{
 		readonly IMethod baseMethod;
 
-		public ReducedExtensionMethod(IMethod baseMethod)
+		public IMethod InvocatedMethod {
-		{
+			get {
-			this.baseMethod = baseMethod;
+				return baseMethod;
-		}
-
-		public override bool Equals(object obj)
-		{
-			var other = obj as ReducedExtensionMethod;
-			if (other == null)
-				return false;
-			return baseMethod.Equals(other.baseMethod);
-		}
-		
-		public override int GetHashCode()
-		{
-			unchecked {
-				return baseMethod.GetHashCode() + 1;
 			}
 		}
 
-		public override string ToString()
+		public InvocatedExtensionMethod(IMethod baseMethod)
 		{
-			return string.Format("[ReducedExtensionMethod: ReducedFrom={0}]", ReducedFrom);
+			this.baseMethod = baseMethod;
 		}
 
 		#region IMember implementation
 
-		[Serializable]
-		public sealed class ReducedExtensionMethodMemberReference : IMemberReference
-		{
-			readonly IMethod baseMethod;
-
-			public ReducedExtensionMethodMemberReference (IMethod baseMethod)
-			{
-				this.baseMethod = baseMethod;
-			}
-
-			#region IMemberReference implementation
-			public IMember Resolve(ITypeResolveContext context)
-			{
-				return new ReducedExtensionMethod ((IMethod)baseMethod.ToMemberReference ().Resolve (context));
-			}
-
-			public ITypeReference DeclaringTypeReference {
-				get {
-					return baseMethod.ToMemberReference ().DeclaringTypeReference;
-				}
-			}
-			#endregion
-		}
-
 		public IMemberReference ToMemberReference()
 		{
-			return new ReducedExtensionMethodMemberReference (baseMethod);
+			return baseMethod.ToMemberReference ();
 		}
 
 		public IMember MemberDefinition {
@@ -167,7 +129,7 @@ namespace ICSharpCode.NRefactory.CSharp
 
 		public bool IsExtensionMethod {
 			get {
-				return false;
+				return baseMethod.IsExtensionMethod;
 			}
 		}
 
@@ -219,10 +181,6 @@ namespace ICSharpCode.NRefactory.CSharp
 			}
 		}
 
-		public IMethod ReducedFrom { 
-			get { return baseMethod; } 
-		}
-
 		#endregion
 
 		#region IParameterizedMember implementation

ICSharpCode.NRefactory.CSharp/Resolver/OverloadResolution.cs

@@ -1,4 +1,4 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of this
 // software and associated documentation files (the "Software"), to deal in the Software
@@ -951,7 +951,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 				throw new InvalidOperationException();
 			
 			if (this.IsExtensionMethodInvocation && member is IMethod)
-				member =new ReducedExtensionMethod ((IMethod)member);
+				member =new InvocatedExtensionMethod ((IMethod)member);
 			return new CSharpInvocationResolveResult(
 				this.IsExtensionMethodInvocation ? new TypeResolveResult(member.DeclaringType) : targetResolveResult,
 				member,

ICSharpCode.NRefactory.Tests/CSharp/Resolver/ExtensionMethodTests.cs

@@ -1,4 +1,4 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of this
 // software and associated documentation files (the "Software"), to deal in the Software
@@ -54,12 +54,12 @@ namespace XN {
 			InvocationResolveResult mrr;
 			
 			mrr = Resolve<CSharpInvocationResolveResult>(program.Replace("$", "$a.F(1)$"));
-			var member = ((IMethod)mrr.Member).ReducedFrom;
+			var member = ((InvocatedExtensionMethod)mrr.Member).InvocatedMethod;
 			Assert.AreEqual("XN.XC.F", member.FullName);
 			Assert.AreEqual("System.Int32", member.Parameters [1].Type.FullName);
 			
 			mrr = Resolve<CSharpInvocationResolveResult>(program.Replace("$", "$a.F(\"text\")$"));
-			member = ((IMethod)mrr.Member).ReducedFrom;
+			member = ((InvocatedExtensionMethod)mrr.Member).InvocatedMethod;
 			Assert.AreEqual("XN.XC.F", member.FullName);
 			Assert.AreEqual("System.String", member.Parameters[1].Type.FullName);
 			
@@ -67,7 +67,7 @@ namespace XN {
 			Assert.AreEqual("B.F", mrr.Member.FullName);
 			
 			mrr = Resolve<CSharpInvocationResolveResult>(program.Replace("$", "$b.F(\"text\")$"));
-			member = ((IMethod)mrr.Member).ReducedFrom;
+			member = ((InvocatedExtensionMethod)mrr.Member).InvocatedMethod;
 			Assert.AreEqual("XN.XC.F", member.FullName);
 			Assert.AreEqual("System.String", member.Parameters[1].Type.FullName);
 			
@@ -146,7 +146,7 @@ public static class XC {
 ";
 			var rr = Resolve<CSharpInvocationResolveResult>(program);
 			Assert.AreEqual("A[]", rr.Type.ReflectionName);
-			var member = ((IMethod)rr.Member).ReducedFrom;
+			var member = ((InvocatedExtensionMethod)rr.Member).InvocatedMethod;
 			Assert.AreEqual("System.Linq.Enumerable.ToArray", member.FullName);
 			Assert.AreEqual("A", ((SpecializedMethod)member).TypeArguments.Single().ReflectionName);
 		}

ICSharpCode.NRefactory.Tests/CSharp/Resolver/LinqTests.cs

@@ -1,4 +1,4 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of this
 // software and associated documentation files (the "Software"), to deal in the Software
@@ -349,7 +349,7 @@ class TestClass
 }";
 			var rr = Resolve<CSharpInvocationResolveResult>(program);
 			Assert.IsFalse(rr.IsError);
-			var member = ((IMethod)rr.Member).ReducedFrom;
+			var member = ((InvocatedExtensionMethod)rr.Member).InvocatedMethod;
 			Assert.AreEqual("SelectMany", member.Name);
 			Assert.AreEqual(3, member.Parameters.Count);
 			var typeArguments = ((SpecializedMethod)member).TypeArguments;
@@ -372,7 +372,7 @@ class TestClass
 }";
 			var rr = Resolve<CSharpInvocationResolveResult>(program);
 			Assert.IsFalse(rr.IsError);
-			var member = ((IMethod)rr.Member).ReducedFrom;
+			var member = ((InvocatedExtensionMethod)rr.Member).InvocatedMethod;
 			Assert.AreEqual("SelectMany", member.Name);
 			Assert.AreEqual(3, member.Parameters.Count);
 			var typeArguments = ((SpecializedMethod)member).TypeArguments;

ICSharpCode.NRefactory/TypeSystem/IMethod.cs

@@ -132,10 +132,5 @@ namespace ICSharpCode.NRefactory.TypeSystem
 		/// Otherwise, returns null.
 		/// </summary>
 		IMember AccessorOwner { get; }
-
-		/// <summary>
-		/// If this method is reduced from an extension method return the original method, <c>null</c> otherwhise.
-		/// </summary>
-		IMethod ReducedFrom { get; }
 	}
 }

ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultResolvedMethod.cs

@@ -209,10 +209,6 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 			get { return ((IUnresolvedMethod)unresolved).AccessorOwner != null; }
 		}
 		
-		public IMethod ReducedFrom { 
-			get { return null; } 
-		}
-
 		public IMember AccessorOwner {
 			get { 
 				var reference = ((IUnresolvedMethod)unresolved).AccessorOwner; 

ICSharpCode.NRefactory/TypeSystem/Implementation/SpecializedMethod.cs

@@ -137,10 +137,6 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 			get { return methodDefinition.IsAccessor; }
 		}
 		
-		public IMethod ReducedFrom { 
-			get { return null; } 
-		}
-
 		IMember accessorOwner;
 		
 		public IMember AccessorOwner {