fixed caret positioning for all inline refactorings

src/AddIns/Misc/SharpRefactoring/Project/Src/Gui/AbstractInlineRefactorDialog.cs

@@ -120,7 +120,8 @@ namespace SharpRefactoring.Gui
 			if (e.Reason == DeactivateReason.ReturnPressed)
 				OKButtonClick(null, null);
 			
-			context.TextArea.Caret.Offset = insertionEndAnchor.Offset;
+			if (e.Reason == DeactivateReason.EscapePressed)
+				CancelButtonClick(null, null);
 			
 			Deactivate();
 		}

src/AddIns/Misc/SharpRefactoring/Project/Src/Gui/InsertCtorDialog.xaml.cs

@@ -207,6 +207,20 @@ namespace SharpRefactoring.Gui
 		public bool AllSelected {
 			get { return parameterList.All(p => p.IsSelected); }
 		}
+		
+		protected override void CancelButtonClick(object sender, System.Windows.RoutedEventArgs e)
+		{
+			base.CancelButtonClick(sender, e);
+			
+			editor.Caret.Offset = anchor.Offset;
+		}
+		
+		protected override void OKButtonClick(object sender, System.Windows.RoutedEventArgs e)
+		{
+			base.OKButtonClick(sender, e);
+			
+			editor.Caret.Offset = insertionEndAnchor.Offset;
+		}
 	}
 	
 	[ValueConversion(typeof(int), typeof(bool))]

src/AddIns/Misc/SharpRefactoring/Project/Src/Gui/OverrideEqualsGetHashCodeMethodsDialog.xaml.cs

@@ -61,11 +61,6 @@ namespace SharpRefactoring.Gui
 			);
 		}
 		
-		protected override void OnInsertionCompleted()
-		{
-			base.OnInsertionCompleted();
-		}
-		
 		static int[] largePrimes = {
 			1000000007, 1000000009, 1000000021, 1000000033,
 			1000000087, 1000000093, 1000000097, 1000000103,
@@ -414,5 +409,12 @@ namespace SharpRefactoring.Gui
 			editor.Document.Insert(anchor.Offset, baseCall);
 			editor.Select(anchor.Offset, baseCall.Length);
 		}
+		
+		protected override void OKButtonClick(object sender, System.Windows.RoutedEventArgs e)
+		{
+			base.OKButtonClick(sender, e);
+			
+			editor.Caret.Offset = insertionEndAnchor.Offset;
+		}
 	}
 }

src/AddIns/Misc/SharpRefactoring/Project/Src/Gui/OverrideToStringMethodDialog.xaml.cs

@@ -22,6 +22,7 @@ namespace SharpRefactoring.Gui
 	{
 		List<PropertyOrFieldWrapper> fields;
 		string baseCall;
+		string insertedCode;
 		
 		public OverrideToStringMethodDialog(InsertionContext context, ITextEditor editor, ITextAnchor startAnchor, ITextAnchor anchor, IList<IField> fields, string baseCall)
 			: base(context, editor, anchor)
@@ -48,7 +49,9 @@ namespace SharpRefactoring.Gui
 				param.Concat(fields.Select(f => new Ast.IdentifierExpression(f))).ToList()
 			));
 			
-			return language.CodeGenerator.GenerateCode(ret, "").Trim();
+			insertedCode = language.CodeGenerator.GenerateCode(ret, "").Trim();
+			
+			return insertedCode;
 		}
 		
 		string GenerateFormatString(IClass currentClass, CodeGenerator generator, string[] fields)
@@ -95,5 +98,12 @@ namespace SharpRefactoring.Gui
 			editor.Document.Insert(anchor.Offset, baseCall);
 			editor.Select(anchor.Offset, baseCall.Length);
 		}
+		
+		protected override void OKButtonClick(object sender, System.Windows.RoutedEventArgs e)
+		{
+			base.OKButtonClick(sender, e);
+			
+			editor.Caret.Offset = insertionEndAnchor.Offset + insertedCode.Length;
+		}
 	}
 }