Implement EnvDTE.CodeInterface.AddFunction()

Author: mrward

src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/CSharpCodeGenerator.cs

@@ -159,6 +159,20 @@ public override void AddFieldAtStart(ITypeDefinition declaringType, Accessibilit
 			}
 		}
 
+		public override void AddMethodAtStart(ITypeDefinition declaringType, Accessibility accessibility, IType returnType, string name)
+		{
+			SDRefactoringContext context = declaringType.CreateRefactoringContext();
+			var typeDecl = context.GetNode<TypeDeclaration>();
+			using (var script = context.StartScript()) {
+				var astBuilder = context.CreateTypeSystemAstBuilder(typeDecl.FirstChild);
+				var methodDecl = new MethodDeclaration();
+				methodDecl.Name = name;
+				methodDecl.ReturnType = astBuilder.ConvertType(context.Compilation.Import(returnType));
+				
+				script.AddTo(typeDecl, methodDecl);
+			}
+		}
+		
 		public override void ChangeAccessibility(IEntity entity, Accessibility newAccessiblity)
 		{
 			// TODO script.ChangeModifiers(...)

src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeInterface.cs

@@ -20,6 +20,7 @@
 using System.Linq;
 using System.Text;
 using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using ICSharpCode.SharpDevelop.Dom;
 
 namespace ICSharpCode.PackageManagement.EnvDTE
@@ -37,9 +38,39 @@ public CodeInterface(CodeModelContext context, ITypeDefinition typeDefinition, p
 
 		public global::EnvDTE.CodeFunction AddFunction(string name, global::EnvDTE.vsCMFunction kind, object type, object Position = null, global::EnvDTE.vsCMAccess Access = global::EnvDTE.vsCMAccess.vsCMAccessPublic)
 		{
-		//	var codeGenerator = new ClassCodeGenerator(Class);
-		//	return codeGenerator.AddPublicMethod(name, (string)type);
+			IType returnType = GetMethodReturnType((string)type);
+			
+			context.CodeGenerator.AddMethodAtStart(typeDefinition, Access.ToAccessibility(), returnType, name);
+			
+			ReloadTypeDefinition();
+			
+			IMethod method = typeDefinition.Methods.FirstOrDefault(f => f.Name == name);
+			if (method != null) {
+				return new CodeFunction(context, method);
+			}
 			return null;
 		}
+		
+		IType GetMethodReturnType(string typeName)
+		{
+			var fullTypeName = new FullTypeName(typeName);
+			
+			IType type = typeDefinition.Compilation.FindType(fullTypeName);
+			if (type != null) {
+				return type;
+			}
+			
+			return new UnknownType(fullTypeName);
+		}
+		
+		void ReloadTypeDefinition()
+		{
+			ICompilation compilation = context.DteProject.GetCompilationUnit(typeDefinition.BodyRegion.FileName);
+			
+			ITypeDefinition matchedTypeDefinition = compilation.MainAssembly.GetTypeDefinition(typeDefinition.FullTypeName);
+			if (matchedTypeDefinition != null) {
+				typeDefinition = matchedTypeDefinition;
+			}
+		}
 	}
 }

src/AddIns/Misc/PackageManagement/Project/Src/ICodeGenerator.cs

@@ -27,5 +27,6 @@ public interface ICodeGenerator
 		void AddImport(FileName fileName, string name);
 		void MakePartial(ITypeDefinition typeDefinition);
 		void AddFieldAtStart(ITypeDefinition typeDefinition, Accessibility accessibility, IType fieldType, string name);
+		void AddMethodAtStart(ITypeDefinition typeDefinition, Accessibility accessibility, IType returnType, string name);
 	}
 }

src/AddIns/Misc/PackageManagement/Project/Src/ThreadSafeCodeGenerator.cs

@@ -54,5 +54,10 @@ public void AddFieldAtStart(ITypeDefinition typeDefinition, Accessibility access
 		{
 			InvokeIfRequired(() => codeGenerator.AddFieldAtStart(typeDefinition, accessibility, fieldType, name));
 		}
+		
+		public void AddMethodAtStart(ITypeDefinition typeDefinition, Accessibility accessibility, IType returnType, string name)
+		{
+			InvokeIfRequired(() => codeGenerator.AddMethodAtStart(typeDefinition, accessibility, returnType, name));
+		}
 	}
 }

src/Main/Base/Project/Refactoring/CodeGenerator.cs

@@ -93,6 +93,11 @@ public virtual void AddFieldAtStart(ITypeDefinition typeDefinition, Accessibilit
 			throw new NotSupportedException("Feature not supported!");
 		}
 
+		public virtual void AddMethodAtStart(ITypeDefinition declaringType, Accessibility accessibility, IType returnType, string name)
+		{
+			throw new NotSupportedException("Feature not supported!");
+		}
+		
 		public virtual void ChangeAccessibility(IEntity entity, Accessibility newAccessiblity)
 		{
 			throw new NotSupportedException("Feature not supported!");