Implement EnvDTE.CodeType.AddVariable()

Author: mrward

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

@@ -144,6 +144,21 @@ public override void AddField(ITypeDefinition declaringType, Accessibility acces
 			}
 		}
 
+		public override void AddFieldAtStart(ITypeDefinition declaringType, Accessibility accessibility, IType fieldType, string name)
+		{
+			SDRefactoringContext context = declaringType.CreateRefactoringContext();
+			var typeDecl = context.GetNode<TypeDeclaration>();
+			using (var script = context.StartScript()) {
+				var astBuilder = context.CreateTypeSystemAstBuilder(typeDecl.FirstChild);
+				var fieldDecl = new FieldDeclaration();
+				fieldDecl.Modifiers = TypeSystemAstBuilder.ModifierFromAccessibility(accessibility);
+				fieldDecl.ReturnType = astBuilder.ConvertType(context.Compilation.Import(fieldType));
+				fieldDecl.Variables.Add(new VariableInitializer(name));
+				
+				script.AddTo(typeDecl, fieldDecl);
+			}
+		}
+		
 		public override void ChangeAccessibility(IEntity entity, Accessibility newAccessiblity)
 		{
 			// TODO script.ChangeModifiers(...)

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

@@ -19,6 +19,7 @@
 using System;
 using System.Linq;
 using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.TypeSystem.Implementation;
 
 namespace ICSharpCode.PackageManagement.EnvDTE
 {
@@ -52,18 +53,39 @@ public CodeClass()
 
 		public virtual global::EnvDTE.CodeVariable AddVariable(string name, object type, object Position = null, global::EnvDTE.vsCMAccess Access = global::EnvDTE.vsCMAccess.vsCMAccessPublic, object Location = null)
 		{
-//			var fieldTypeName = new FullTypeName((string)type);
-//			var typeDefinition = typeModel.Resolve();
-//			if (typeDefinition == null)
-//				return null;
-//			
-//			IType fieldType = typeDefinition.Compilation.FindType(fieldTypeName);
-//			context.CodeGenerator.AddField(typeDefinition, Access.ToAccessibility(), fieldType, name);
-//			var fieldModel = typeModel.Members.OfType<IFieldModel>().FirstOrDefault(f => f.Name == name);
-//			if (fieldModel != null) {
-//				return new CodeVariable(context, fieldModel);
-//			}
+			IType fieldType = GetFieldType((string)type);
+			
+			context.CodeGenerator.AddFieldAtStart(typeDefinition, Access.ToAccessibility(), fieldType, name);
+			
+			ReloadTypeDefinition();
+			
+			IField field = typeDefinition.Fields.FirstOrDefault(f => f.Name == name);
+			if (field != null) {
+				return new CodeVariable(context, field);
+			}
 			return null;
 		}
+		
+		IType GetFieldType(string type)
+		{
+			var fieldTypeName = new FullTypeName(type);
+			
+			IType fieldType = typeDefinition.Compilation.FindType(fieldTypeName);
+			if (fieldType != null) {
+				return fieldType;
+			}
+			
+			return new UnknownType(fieldTypeName);
+		}
+		
+		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/EnvDTE/CodeType.cs

@@ -28,7 +28,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE
 {
 	public class CodeType : CodeElement, global::EnvDTE.CodeType
 	{
-		protected readonly ITypeDefinition typeDefinition;
+		protected ITypeDefinition typeDefinition;
 		IType[] typeArguments;
 
 		CodeElementsList<CodeElement> members;

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

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

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

@@ -49,5 +49,10 @@ void InvokeIfRequired(Action action)
 		{
 			mainThread.InvokeIfRequired(action);
 		}
+		
+		public void AddFieldAtStart(ITypeDefinition typeDefinition, Accessibility accessibility, IType fieldType, string name)
+		{
+			InvokeIfRequired(() => codeGenerator.AddFieldAtStart(typeDefinition, accessibility, fieldType, name));
+		}
 	}
 }

src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj

@@ -398,11 +398,5 @@
     <Folder Include="Src\VisualStudio" />
     <Folder Include="Src\Scripting" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\..\bin\SharpDevelop.exe">
-      <Link>SharpDevelop.exe</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>

src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/Script.cs

@@ -222,7 +222,16 @@ public void AddTo(BlockStatement bodyStatement, AstNode newNode)
 			output.RegisterTrackedSegments(this, startOffset);
 			CorrectFormatting (null, newNode);
 		}
-
+	
+		public void AddTo(TypeDeclaration typeDecl, EntityDeclaration entityDecl)
+		{
+			var startOffset = GetCurrentOffset(typeDecl.LBraceToken.EndLocation);
+			var output = OutputNode(1 + GetIndentLevelAt(startOffset), entityDecl, true);
+			InsertText(startOffset, output.Text);
+			output.RegisterTrackedSegments(this, startOffset);
+			CorrectFormatting (null, entityDecl);
+		}
+		
 		/// <summary>
 		/// Changes the modifier of a given entity declaration.
 		/// </summary>

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

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