Merge pull request #540 from linquize/winform-new-field

WinForms Designer: Insert new fields below the last field of class in its designer.cs

Author: siegfriedpammer

src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpDesignerGenerator.cs

@@ -297,9 +297,9 @@ string GenerateField(CodeMemberField newField)
 
 		void CreateField(CodeMemberField newField)
 		{
-			// insert new field below InitializeComponents()
-
-			var bodyRegion = initializeComponents.BodyRegion;
+			// insert new field below the last field or InitializeComponents()
+			var field = FormsDesignerSecondaryDisplayBinding.GetLastField(formClass, initializeComponents.BodyRegion.FileName);
+			var bodyRegion = field != null ? field.BodyRegion : initializeComponents.BodyRegion;
 			DocumentScript script = GetScript(bodyRegion.FileName);
 			string newline = DocumentUtilities.GetLineTerminator(script.OriginalDocument, bodyRegion.BeginLine);
 			string indentation = DocumentUtilities.GetIndentation(script.OriginalDocument, bodyRegion.BeginLine);

src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/SecondaryDisplayBinding.cs

@@ -55,6 +55,13 @@ public static IMethod GetInitializeComponents(ITypeDefinition c)
 			}
 			return null;
 		}
+		
+		public static IField GetLastField(ITypeDefinition c, string fileNmae)
+		{
+			if (c == null)
+				return null;
+			return c.Fields.LastOrDefault(field => field.BodyRegion.FileName == fileNmae);
+		}
 
 		public static bool BaseClassIsFormOrControl(ITypeDefinition c)
 		{