diff options
author | Mike Krüger <mkrueger@xamarin.com> | 2011-10-26 15:57:32 +0400 |
---|---|---|
committer | Mike Krüger <mkrueger@xamarin.com> | 2011-10-26 15:57:32 +0400 |
commit | 5ba64e4f967e49c0ddc96179fe919a0837463e27 (patch) | |
tree | 284278e01c75bd78f6054e39ae5bead0bc7f7cb2 /main/src/addins/MonoDevelop.Refactoring | |
parent | 6cf6e34954b32247d8970a0712e1a12cebe4b52d (diff) | |
parent | 21ad778ec4c166c9e06218ccc173a547c2c0f6ec (diff) |
Merge branch 'master' into newresolver
Conflicts:
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MemberCompletionData.cs
main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectInfoService.cs
Diffstat (limited to 'main/src/addins/MonoDevelop.Refactoring')
-rw-r--r-- | main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Change.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Change.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Change.cs index f63f5264ba..9d3d06558c 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Change.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Change.cs @@ -85,13 +85,16 @@ namespace MonoDevelop.Refactoring } static List<TextEditorData> textEditorDatas = new List<TextEditorData> (); + static List<IDisposable> undoGroups = new List<IDisposable> (); + public static void FinishRefactoringOperation () { foreach (TextEditorData data in textEditorDatas) { - data.Document.EndAtomicUndo (); data.Document.CommitUpdateAll (); } textEditorDatas.Clear (); + undoGroups.ForEach (grp => grp.Dispose ()); + undoGroups.Clear (); } internal static TextEditorData GetTextEditorData (string fileName) @@ -103,7 +106,7 @@ namespace MonoDevelop.Refactoring TextEditorData result = doc.Editor; if (result != null) { textEditorDatas.Add (result); - result.Document.BeginAtomicUndo (); + undoGroups.Add (result.OpenUndoGroup ()); return result; } } |