diff options
| author | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2011-11-08 21:57:22 +0400 |
|---|---|---|
| committer | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2011-11-08 21:57:22 +0400 |
| commit | 3d7a7f93a50819a5089e21bfedd332dc08d4f0ce (patch) | |
| tree | 0956c7d9cd3c6d2cc7344398ea6fb182952a55be /main/src/addins/MonoDevelop.Refactoring | |
| parent | e51679b1a150ba564ade1510f94e9c05c4e6fa65 (diff) | |
| parent | ec035e02db5d9b6e9a2c2275d3145b44264dc546 (diff) | |
Merge remote-tracking branch 'origin/master' into macgtk
Conflicts:
extras/GtkSourceViewEditor/MonoDevelop.SourceEditor.addin.xml
main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
main/src/core/Mono.Texteditor/Mono.TextEditor/GtkWorkarounds.cs
Diffstat (limited to 'main/src/addins/MonoDevelop.Refactoring')
| -rw-r--r-- | main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml | 10 | ||||
| -rw-r--r-- | main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Change.cs | 7 |
2 files changed, 10 insertions, 7 deletions
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml index ab74be07a7..e6b2f4904b 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml @@ -7,17 +7,17 @@ url = "http://www.monodevelop.com/" description = "Provides refactoring support to MonoDevelop" category = "IDE extensions" - version = "2.8.1"> + version = "2.8.2"> <Runtime> <Import assembly = "MonoDevelop.Refactoring.dll"/> </Runtime> <Dependencies> - <Addin id="Core" version="2.8.1"/> - <Addin id="Ide" version="2.8.1"/> - <Addin id="DesignerSupport" version="2.8.1"/> - <Addin id="SourceEditor2" version="2.8.1"/> + <Addin id="Core" version="2.8.2"/> + <Addin id="Ide" version="2.8.2"/> + <Addin id="DesignerSupport" version="2.8.2"/> + <Addin id="SourceEditor2" version="2.8.2"/> </Dependencies> <!-- Extension Points --> diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Change.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Change.cs index 174c7145c8..3e5a48e757 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Change.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Change.cs @@ -86,13 +86,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) @@ -104,7 +107,7 @@ namespace MonoDevelop.Refactoring TextEditorData result = doc.Editor; if (result != null) { textEditorDatas.Add (result); - result.Document.BeginAtomicUndo (); + undoGroups.Add (result.OpenUndoGroup ()); return result; } } |