Refactor IronPython resolver.

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IPythonResolver.cs

@@ -8,6 +8,6 @@ namespace ICSharpCode.PythonBinding
 {
 	public interface IPythonResolver
 	{
-		ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult);
+		ResolveResult Resolve(PythonResolverContext resolverContext);
 	}
 }

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonClassResolver.cs

@@ -10,19 +10,21 @@ namespace ICSharpCode.PythonBinding
 	{
 		PythonResolverContext resolverContext;
 		
-		public PythonClassResolver()
+		public ResolveResult Resolve(PythonResolverContext resolverContext)
 		{
-		}
+			IClass matchingClass = GetClass(resolverContext);
-		
-		public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult)
-		{
-			IClass matchingClass = GetClass(resolverContext, expressionResult.Expression);
 			if (matchingClass != null) {
 				return CreateTypeResolveResult(matchingClass);
 			}
 			return null;
 		}
 		
+		public IClass GetClass(PythonResolverContext resolverContext)
+		{
+			string name = resolverContext.Expression;
+			return GetClass(resolverContext, name);
+		}
+		
 		public IClass GetClass(PythonResolverContext resolverContext, string name)
 		{
 			this.resolverContext = resolverContext;

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonDotNetMethodResolver.cs

@@ -15,9 +15,9 @@ namespace ICSharpCode.PythonBinding
 			this.classResolver = classResolver;
 		}
 		
-		public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult)
+		public ResolveResult Resolve(PythonResolverContext resolverContext)
 		{
-			MemberName memberName = new MemberName(expressionResult.Expression);
+			MemberName memberName = resolverContext.CreateExpressionMemberName();
 			IClass matchingClass = classResolver.GetClass(resolverContext, memberName.Type);
 			if (matchingClass != null) {
 				return new PythonMethodGroupResolveResult(matchingClass, memberName.Name);

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonImportResolver.cs

@@ -8,15 +8,11 @@ namespace ICSharpCode.PythonBinding
 {
 	public class PythonImportResolver : IPythonResolver
 	{
-		public PythonImportResolver()
+		public ResolveResult Resolve(PythonResolverContext resolverContext)
 		{
-		}
+			if (IsNamespace(resolverContext.ExpressionResult)) {
-		
+				PythonImportExpression importExpression = new PythonImportExpression(resolverContext.Expression);
-		public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult)
+				PythonImportExpressionContext context = resolverContext.ExpressionContext as PythonImportExpressionContext;
-		{
-			if (IsNamespace(expressionResult)) {
-				PythonImportExpression importExpression = new PythonImportExpression(expressionResult.Expression);
-				PythonImportExpressionContext context = expressionResult.Context as PythonImportExpressionContext;
 				context.HasFromAndImport = importExpression.HasFromAndImport;
 				
 				return new PythonImportModuleResolveResult(importExpression);

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonLocalVariableResolver.cs

@@ -123,34 +123,36 @@ namespace ICSharpCode.PythonBinding
 			return PythonControlFieldExpression.GetMemberName(node as MemberExpression);
 		}
 		
-		public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult)
+		public ResolveResult Resolve(PythonResolverContext resolverContext)
 		{
-			return GetLocalVariable(resolverContext, expressionResult);
+			return GetLocalVariable(resolverContext);
 		}
 		
 		/// <summary>
 		/// Tries to find the type that matches the local variable name.
 		/// </summary>
-		LocalResolveResult GetLocalVariable(PythonResolverContext resolverContext, ExpressionResult expressionResult)
+		LocalResolveResult GetLocalVariable(PythonResolverContext resolverContext)
 		{
-			string code = GetLocalMethodCode(resolverContext.FileContent, expressionResult);
+			string code = GetLocalMethodCode(resolverContext);
-			string typeName = Resolve(expressionResult.Expression, code);
+			string typeName = Resolve(resolverContext.Expression, code);
 			if (typeName != null) {
-				return CreateLocalResolveResult(typeName, expressionResult.Expression, resolverContext);
+				return CreateLocalResolveResult(typeName, resolverContext);
 			}
 			return null;
 		}
 		
-		string GetLocalMethodCode(string fullCode, ExpressionResult expressionResult)
+		string GetLocalMethodCode(PythonResolverContext resolverContext)
 		{
-			ScriptingLocalMethod localMethod = new ScriptingLocalMethod(fullCode);
+			ScriptingLocalMethod localMethod = new ScriptingLocalMethod(resolverContext.FileContent);
-			return localMethod.GetCode(expressionResult.Region.BeginLine);
+			int beginLine = resolverContext.ExpressionRegion.BeginLine;
+			return localMethod.GetCode(beginLine);
 		}
 		
-		LocalResolveResult CreateLocalResolveResult(string typeName, string identifier, PythonResolverContext resolverContext)
+		LocalResolveResult CreateLocalResolveResult(string typeName, PythonResolverContext resolverContext)
 		{
 			IClass resolvedClass = classResolver.GetClass(resolverContext, typeName);
 			if (resolvedClass != null) {
+				string identifier = resolverContext.Expression;
 				return CreateLocalResolveResult(identifier, resolvedClass);
 			}
 			return null;

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonMemberResolver.cs

@@ -19,15 +19,20 @@ namespace ICSharpCode.PythonBinding
 			this.classResolver = classResolver;
 		}
 		
-		public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult)
+		public ResolveResult Resolve(PythonResolverContext resolverContext)
 		{
-			IMember member = FindMember(resolverContext, expressionResult.Expression);
+			IMember member = FindMember(resolverContext);
 			if (member != null) {
 				return CreateMemberResolveResult(member);
 			}
 			return null;
 		}
 		
+		IMember FindMember(PythonResolverContext resolverContext)
+		{
+			return FindMember(resolverContext, resolverContext.Expression);
+		}
+		
 		IMember FindMember(PythonResolverContext resolverContext, string expression)
 		{
 			MemberName memberName = new MemberName(expression);

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonMethodResolver.cs

@@ -17,13 +17,13 @@ namespace ICSharpCode.PythonBinding
 			standardModuleMethodResolver = new PythonStandardModuleMethodResolver(standardModuleResolver);
 		}
 		
-		public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult)
+		public ResolveResult Resolve(PythonResolverContext resolverContext)
 		{
-			ResolveResult resolveResult = dotNetMethodResolver.Resolve(resolverContext, expressionResult);
+			ResolveResult resolveResult = dotNetMethodResolver.Resolve(resolverContext);
 			if (resolveResult != null) {
 				return resolveResult;
 			}
-			return standardModuleMethodResolver.Resolve(resolverContext, expressionResult);
+			return standardModuleMethodResolver.Resolve(resolverContext);
 		}
 	}
 }

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonNamespaceResolver.cs

@@ -11,8 +11,9 @@ namespace ICSharpCode.PythonBinding
 		PythonResolverContext resolverContext;
 		ExpressionResult expressionResult;
 		
-		public PythonNamespaceResolver()
+		public ResolveResult Resolve(PythonResolverContext resolverContext)
 		{
+			return Resolve(resolverContext, resolverContext.ExpressionResult);
 		}
 		
 		public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult)

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolver.cs

@@ -46,18 +46,18 @@ namespace ICSharpCode.PythonBinding
 				return null;
 			}
 			
-			resolverContext = new PythonResolverContext(parseInfo, fileContent);
+			resolverContext = new PythonResolverContext(parseInfo, expressionResult, fileContent);
-			if (!resolverContext.GetCallingMember(expressionResult.Region)) {
+			if (!resolverContext.HasProjectContent) {
 				return null;
 			}
 			
-			return Resolve(resolverContext, expressionResult);
+			return Resolve(resolverContext);
 		}
 		
-		public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult)
+		public ResolveResult Resolve(PythonResolverContext resolverContext)
 		{
 			foreach (IPythonResolver resolver in resolvers) {
-				ResolveResult resolveResult = resolver.Resolve(resolverContext, expressionResult);
+				ResolveResult resolveResult = resolver.Resolve(resolverContext);
 				if (resolveResult != null) {
 					return resolveResult;
 				}

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolverContext.cs

@@ -14,6 +14,7 @@ namespace ICSharpCode.PythonBinding
 		IProjectContent projectContent;
 		IClass callingClass;
 		string fileContent;
+		ExpressionResult expressionResult;
 		
 		public PythonResolverContext(ParseInformation parseInfo)
 			: this(parseInfo, String.Empty)
@@ -21,10 +22,17 @@ namespace ICSharpCode.PythonBinding
 		}
 		
 		public PythonResolverContext(ParseInformation parseInfo, string fileContent)
+			: this(parseInfo, new ExpressionResult(), fileContent)
+		{
+		}
+		
+		public PythonResolverContext(ParseInformation parseInfo, ExpressionResult expressionResult, string fileContent)
 		{
 			this.fileContent = fileContent;
+			this.expressionResult = expressionResult;
 			GetCompilationUnit(parseInfo);
 			GetProjectContent();
+			GetCallingMember();
 		}
 		
 		void GetCompilationUnit(ParseInformation parseInfo)
@@ -41,6 +49,27 @@ namespace ICSharpCode.PythonBinding
 			}
 		}
 		
+		/// <summary>
+		/// Determines the class and member at the specified
+		/// line and column in the specified file.
+		/// </summary>
+		void GetCallingMember()
+		{
+			if (projectContent != null) {
+				GetCallingClass();
+			}
+		}
+				
+		/// <summary>
+		/// Gets the calling class at the specified line and column.
+		/// </summary>
+		void GetCallingClass()
+		{
+			if (compilationUnit.Classes.Count > 0) {
+				callingClass = compilationUnit.Classes[0];
+			}
+		}
+		
 		public string FileContent {
 			get { return fileContent; }
 		}
@@ -49,6 +78,27 @@ namespace ICSharpCode.PythonBinding
 			get { return projectContent; }
 		}
 		
+		public ExpressionResult ExpressionResult {
+			get { return expressionResult; }
+		}
+		
+		public MemberName CreateExpressionMemberName()
+		{
+			return new MemberName(Expression);
+		}
+		
+		public string Expression {
+			get { return expressionResult.Expression; }
+		}
+		
+		public ExpressionContext ExpressionContext {
+			get { return expressionResult.Context; }
+		}
+		
+		public DomRegion ExpressionRegion {
+			get { return expressionResult.Region; }
+		}
+		
 		public bool HasProjectContent {
 			get { return projectContent != null; }
 		}
@@ -86,34 +136,6 @@ namespace ICSharpCode.PythonBinding
 			return false;
 		}
 		
-		/// <summary>
-		/// Determines the class and member at the specified
-		/// line and column in the specified file.
-		/// </summary>
-		public bool GetCallingMember(DomRegion region)
-		{
-			if (compilationUnit == null) {
-				return false;
-			}
-			
-			if (projectContent != null) {
-				callingClass = GetCallingClass(region);
-				return true;
-			}
-			return false;
-		}
-				
-		/// <summary>
-		/// Gets the calling class at the specified line and column.
-		/// </summary>
-		IClass GetCallingClass(DomRegion region)
-		{
-			if (compilationUnit.Classes.Count > 0) {
-				return compilationUnit.Classes[0];
-			}
-			return null;
-		}
-		
 		public IClass GetClass(string fullyQualifiedName)
 		{
 			return projectContent.GetClass(fullyQualifiedName, 0);

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonSelfResolver.cs

@@ -8,22 +8,22 @@ namespace ICSharpCode.PythonBinding
 {
 	public class PythonSelfResolver : IPythonResolver
 	{
-		public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult)
+		public ResolveResult Resolve(PythonResolverContext resolverContext)
 		{
 			if (resolverContext.HasCallingClass) {
-				if (IsSelfExpression(expressionResult)) {
+				if (IsSelfExpression(resolverContext)) {
 					return CreateResolveResult(resolverContext);
-				} else if (IsSelfExpressionAtStart(expressionResult)) {
+				} else if (IsSelfExpressionAtStart(resolverContext)) {
-					MemberName memberName = new MemberName(expressionResult.Expression);
+					MemberName memberName = resolverContext.CreateExpressionMemberName();
 					return new PythonMethodGroupResolveResult(resolverContext.CallingClass, memberName.Name);
 				}
 			}
 			return null;
 		}
 		
-		bool IsSelfExpression(ExpressionResult expressionResult)
+		bool IsSelfExpression(PythonResolverContext resolverContext)
 		{
-			return expressionResult.Expression == "self";
+			return resolverContext.Expression == "self";
 		}
 		
 		ResolveResult CreateResolveResult(PythonResolverContext resolverContext)
@@ -33,9 +33,9 @@ namespace ICSharpCode.PythonBinding
 			return new ResolveResult(callingClass, null, returnType);
 		}
 		
-		bool IsSelfExpressionAtStart(ExpressionResult expressionResult)
+		bool IsSelfExpressionAtStart(PythonResolverContext resolverContext)
 		{
-			return expressionResult.Expression.StartsWith("self.");
+			return resolverContext.Expression.StartsWith("self.");
 		}
 	}
 }

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonStandardModuleMethodResolver.cs

@@ -15,9 +15,9 @@ namespace ICSharpCode.PythonBinding
 			this.standardModuleResolver = standardModuleResolver;
 		}
 		
-		public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult)
+		public ResolveResult Resolve(PythonResolverContext resolverContext)
 		{
-			MemberName memberName = new MemberName(expressionResult.Expression);
+			MemberName memberName = resolverContext.CreateExpressionMemberName();
 			MethodGroupResolveResult result = ResolveMethodFromImportedNames(resolverContext, memberName);
 			if (result != null) {
 				return result;

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonStandardModuleResolver.cs

@@ -10,19 +10,21 @@ namespace ICSharpCode.PythonBinding
 	{
 		PythonStandardModules standardPythonModules = new PythonStandardModules();
 		
-		public PythonStandardModuleResolver()
+		public ResolveResult Resolve(PythonResolverContext resolverContext)
 		{
-		}
+			PythonStandardModuleType type = GetStandardModuleTypeIfImported(resolverContext);
-		
-		public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult)
-		{
-			PythonStandardModuleType type = GetStandardModuleTypeIfImported(resolverContext, expressionResult.Expression);
 			if (type != null) {
 				return new PythonStandardModuleResolveResult(type);
 			}
 			return null;
 		}
 		
+		PythonStandardModuleType GetStandardModuleTypeIfImported(PythonResolverContext resolverContext)
+		{
+			string moduleName = resolverContext.Expression;
+			return GetStandardModuleTypeIfImported(resolverContext, moduleName);
+		}
+		
 		public PythonStandardModuleType GetStandardModuleTypeIfImported(PythonResolverContext resolverContext, string moduleName)
 		{
 			if (resolverContext.HasImport(moduleName) || PythonBuiltInModuleMemberName.IsBuiltInModule(moduleName)) {

src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/PythonSelfResolverTests.cs

@@ -24,14 +24,13 @@ namespace PythonBinding.Tests.Resolver
 			CreateParseInfo();
 			CreatePythonResolverContext();
 			
-			ResolveResult result = resolver.Resolve(context, expression);
+			ResolveResult result = resolver.Resolve(context);
 			Assert.IsNull(result);
 		}
 		
 		void CreatePythonSelfResolver()
 		{
 			resolver = new PythonSelfResolver();
-			expression = new ExpressionResult("self");
 		}
 		
 		void CreateParseInfo()
@@ -43,7 +42,8 @@ namespace PythonBinding.Tests.Resolver
 		
 		void CreatePythonResolverContext()
 		{
-			context = new PythonResolverContext(parseInfo);
+			expression = new ExpressionResult("self");
+			context = new PythonResolverContext(parseInfo, expression, String.Empty);
 		}
 	}
 }

src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonResolverTestsHelper.cs

@@ -36,9 +36,8 @@ namespace PythonBinding.Tests.Utils
 		public ResolveResult Resolve(string expression)
 		{
 			ExpressionResult expressionResult = new ExpressionResult(expression);
-			PythonResolverContext context = new PythonResolverContext(ParseInfo);
+			PythonResolverContext context = new PythonResolverContext(ParseInfo, expressionResult, String.Empty);
-			context.GetCallingMember(expressionResult.Region);
+			ResolveResult = Resolver.Resolve(context);
-			ResolveResult = Resolver.Resolve(context, expressionResult);
 			return ResolveResult;
 		}