cleaning up the pull request

icsharpcode · Aug 23, 2014 · 672e65a · 672e65a
1 parent ce21246
commit 672e65a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/...AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpDesignerGenerator.cs b/...AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpDesignerGenerator.cs
@@ -298,7 +298,12 @@ string GenerateField(CodeMemberField newField)
 		void CreateField(CodeMemberField newField)
 		{
 			// insert new field below the last field or InitializeComponents()
-			var field = FormsDesignerSecondaryDisplayBinding.GetLastField(formClass, initializeComponents.BodyRegion.FileName);
+			IField field = null;
+			if (formClass != null) {
+				field = formClass.Fields.LastOrDefault(f => string.Equals(f.Region.FileName,
+				                                                          initializeComponents.Region.FileName,
+				                                                          StringComparison.OrdinalIgnoreCase));
+			}
 			var bodyRegion = field != null ? field.BodyRegion : initializeComponents.BodyRegion;
 			DocumentScript script = GetScript(bodyRegion.FileName);
 			string newline = DocumentUtilities.GetLineTerminator(script.OriginalDocument, bodyRegion.BeginLine);

diff --git a/...AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/SecondaryDisplayBinding.cs b/...AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/SecondaryDisplayBinding.cs
@@ -55,13 +55,6 @@ 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)
 		{