diff --git a/SharpDevelop.sln b/SharpDevelop.sln index 14f8178c41..873d53ea78 100644 --- a/SharpDevelop.sln +++ b/SharpDevelop.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -# SharpDevelop 4.2.0.8590-beta +# SharpDevelop 4.2.0.8634-beta Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{256F5C28-532C-44C0-8AB8-D8EC5E492E01}" ProjectSection(SolutionItems) = postProject EndProjectSection diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj index de34cbd7e5..c6e8f8ac82 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj @@ -72,6 +72,8 @@ + + Always @@ -108,12 +110,6 @@ - - - - - - @@ -244,7 +240,7 @@ - + \ No newline at end of file diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs index 5ddc978bff..600cba254f 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs @@ -14,6 +14,7 @@ using ICSharpCode.AvalonEdit.Editing; using ICSharpCode.AvalonEdit.Highlighting; using ICSharpCode.AvalonEdit.Rendering; using ICSharpCode.SharpDevelop.Editor; +using ICSharpCode.SharpDevelop.Widgets.MyersDiff; namespace ICSharpCode.AvalonEdit.AddIn { diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditor.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditor.cs index ce4b7a2366..c821cccfa5 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditor.cs +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditor.cs @@ -14,7 +14,6 @@ using System.Windows.Data; using System.Windows.Input; using System.Windows.Threading; -using ICSharpCode.AvalonEdit.AddIn.MyersDiff; using ICSharpCode.AvalonEdit.AddIn.Options; using ICSharpCode.AvalonEdit.Document; using ICSharpCode.AvalonEdit.Editing; @@ -30,6 +29,7 @@ using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Editor.AvalonEdit; using ICSharpCode.SharpDevelop.Editor.CodeCompletion; +using ICSharpCode.SharpDevelop.Widgets.MyersDiff; namespace ICSharpCode.AvalonEdit.AddIn { diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DefaultChangeWatcher.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DefaultChangeWatcher.cs index b4c271f174..8e139caac6 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DefaultChangeWatcher.cs +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DefaultChangeWatcher.cs @@ -6,11 +6,12 @@ using System.Collections.Generic; using System.ComponentModel; using System.IO; using System.Linq; -using ICSharpCode.AvalonEdit.AddIn.MyersDiff; + using ICSharpCode.AvalonEdit.Document; using ICSharpCode.AvalonEdit.Utils; using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Editor; +using ICSharpCode.SharpDevelop.Widgets.MyersDiff; namespace ICSharpCode.AvalonEdit.AddIn { diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/MyersDiff/DocumentSequence.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DocumentSequence.cs similarity index 93% rename from src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/MyersDiff/DocumentSequence.cs rename to src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DocumentSequence.cs index 89f8850197..6535310217 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/MyersDiff/DocumentSequence.cs +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DocumentSequence.cs @@ -4,8 +4,9 @@ using System; using System.Collections.Generic; using ICSharpCode.SharpDevelop.Editor; +using ICSharpCode.SharpDevelop.Widgets.MyersDiff; -namespace ICSharpCode.AvalonEdit.AddIn.MyersDiff +namespace ICSharpCode.AvalonEdit.AddIn { public class DocumentSequence : ISequence { diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/LineChangeInfo.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/LineChangeInfo.cs index cba099d4b6..a38c940ff3 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/LineChangeInfo.cs +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/LineChangeInfo.cs @@ -3,6 +3,7 @@ using System; using ICSharpCode.SharpDevelop.Editor; +using ICSharpCode.SharpDevelop.Widgets.MyersDiff; namespace ICSharpCode.AvalonEdit.AddIn { @@ -21,16 +22,7 @@ namespace ICSharpCode.AvalonEdit.AddIn IDocument CurrentDocument { get; } IDocument BaseDocument { get; } } - - public enum ChangeType - { - None, - Added, - Deleted, - Modified, - Unsaved - } - + public struct LineChangeInfo : IEquatable { public static readonly LineChangeInfo EMPTY = new LineChangeInfo(ChangeType.None, 1, 1); diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/MyersDiff/Utils.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Utils.cs similarity index 73% rename from src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/MyersDiff/Utils.cs rename to src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Utils.cs index 47cab1a9b9..74fcd42406 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/MyersDiff/Utils.cs +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Utils.cs @@ -4,24 +4,14 @@ using System; using System.Collections.Generic; using System.Diagnostics; -using System.Linq; + using ICSharpCode.AvalonEdit.Document; +using ICSharpCode.SharpDevelop.Widgets.MyersDiff; -namespace ICSharpCode.AvalonEdit.AddIn.MyersDiff +namespace ICSharpCode.AvalonEdit.AddIn { public static class Utils { - public static void Set(this IList instance, int index, T value) - { - if (instance == null) - throw new ArgumentNullException("instance"); - - if (index == instance.Count) - instance.Add(value); - else - instance[index] = value; - } - public static OffsetChangeMap ToOffsetChangeMap(this IEnumerable edits) { var map = new OffsetChangeMap(); diff --git a/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ICSharpCode.SharpDevelop.Widgets.csproj b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ICSharpCode.SharpDevelop.Widgets.csproj index f7ccfda229..1d84def9d6 100644 --- a/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ICSharpCode.SharpDevelop.Widgets.csproj +++ b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ICSharpCode.SharpDevelop.Widgets.csproj @@ -78,6 +78,11 @@ + + + + + NumericUpDown.xaml @@ -117,6 +122,7 @@ + diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/MyersDiff/Edit.cs b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/MyersDiff/Edit.cs similarity index 97% rename from src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/MyersDiff/Edit.cs rename to src/Main/ICSharpCode.SharpDevelop.Widgets/Project/MyersDiff/Edit.cs index ed9a16e9f7..26234c1174 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/MyersDiff/Edit.cs +++ b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/MyersDiff/Edit.cs @@ -37,9 +37,8 @@ */ using System; -using ICSharpCode.SharpDevelop.Editor; -namespace ICSharpCode.AvalonEdit.AddIn.MyersDiff +namespace ICSharpCode.SharpDevelop.Widgets.MyersDiff { /// /// A modified region detected between two versions of roughly the same content. @@ -200,5 +199,13 @@ namespace ICSharpCode.AvalonEdit.AddIn.MyersDiff } } - + /// Moved from AvaloEdit + public enum ChangeType + { + None, + Added, + Deleted, + Modified, + Unsaved + } } diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/MyersDiff/ISequence.cs b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/MyersDiff/ISequence.cs similarity index 98% rename from src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/MyersDiff/ISequence.cs rename to src/Main/ICSharpCode.SharpDevelop.Widgets/Project/MyersDiff/ISequence.cs index 16f6dbf311..bc10a57211 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/MyersDiff/ISequence.cs +++ b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/MyersDiff/ISequence.cs @@ -38,7 +38,7 @@ using System; -namespace ICSharpCode.AvalonEdit.AddIn.MyersDiff +namespace ICSharpCode.SharpDevelop.Widgets.MyersDiff { /// /// Arbitrary sequence of elements with fast comparison support. @@ -85,5 +85,4 @@ namespace ICSharpCode.AvalonEdit.AddIn.MyersDiff bool Equals(int thisIdx, ISequence other, int otherIdx); } - } diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/MyersDiff/MyersDiffAlgorithm.cs b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/MyersDiff/MyersDiffAlgorithm.cs similarity index 99% rename from src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/MyersDiff/MyersDiffAlgorithm.cs rename to src/Main/ICSharpCode.SharpDevelop.Widgets/Project/MyersDiff/MyersDiffAlgorithm.cs index 08aa723c40..f9d50a5b6b 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/MyersDiff/MyersDiffAlgorithm.cs +++ b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/MyersDiff/MyersDiffAlgorithm.cs @@ -38,9 +38,8 @@ using System; using System.Collections.Generic; -using ICSharpCode.SharpDevelop.Editor; -namespace ICSharpCode.AvalonEdit.AddIn.MyersDiff +namespace ICSharpCode.SharpDevelop.Widgets.MyersDiff { /// /// Diff algorithm, based on "An O(ND) Difference Algorithm and its diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/MyersDiff/StringSequence.cs b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/MyersDiff/StringSequence.cs similarity index 88% rename from src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/MyersDiff/StringSequence.cs rename to src/Main/ICSharpCode.SharpDevelop.Widgets/Project/MyersDiff/StringSequence.cs index f521605f1e..353a127c76 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/MyersDiff/StringSequence.cs +++ b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/MyersDiff/StringSequence.cs @@ -3,9 +3,8 @@ using System; using System.Collections.Generic; -using ICSharpCode.SharpDevelop.Editor; -namespace ICSharpCode.AvalonEdit.AddIn.MyersDiff +namespace ICSharpCode.SharpDevelop.Widgets.MyersDiff { public class StringSequence : ISequence { diff --git a/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/MyersDiff/Utils.cs b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/MyersDiff/Utils.cs new file mode 100644 index 0000000000..942a3ad981 --- /dev/null +++ b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/MyersDiff/Utils.cs @@ -0,0 +1,22 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections.Generic; + +namespace ICSharpCode.SharpDevelop.Widgets.MyersDiff +{ + public static class Utils + { + public static void Set(this IList instance, int index, T value) + { + if (instance == null) + throw new ArgumentNullException("instance"); + + if (index == instance.Count) + instance.Add(value); + else + instance[index] = value; + } + } +}