diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2012-04-12 10:53:17 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2012-04-12 10:53:17 +0400 |
| commit | 9ed729ee0eeb745a4c2da86d40fb1d9769b8feb3 (patch) | |
| tree | f2a6b66a0a19927b382d3877532ee22c71ce54ec /main/src/addins/VersionControl | |
| parent | 5657018e26d58ac3afae0d810ca527584fa2cc45 (diff) | |
[TextEditor] Renamed LineSegment -> DocumentLine.
ISegment was replaced with TextSegment. And lines aren't segments
anymore - this name reflects that better.
Diffstat (limited to 'main/src/addins/VersionControl')
| -rw-r--r-- | main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs index 226de6105c..1d4377df66 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs @@ -123,14 +123,14 @@ namespace MonoDevelop.VersionControl.Views { int mergeStart = 0; while ((mergeStart = doc.IndexOf ("<<<<<<<", mergeStart, doc.TextLength - mergeStart, StringComparison.Ordinal)) >= 0) { - LineSegment start = doc.GetLineByOffset (mergeStart); + DocumentLine start = doc.GetLineByOffset (mergeStart); if (start.Offset != mergeStart) continue; int dividerOffset = doc.IndexOf ("=======", mergeStart, doc.TextLength - mergeStart, StringComparison.Ordinal); - LineSegment divider = doc.GetLineByOffset (dividerOffset); + DocumentLine divider = doc.GetLineByOffset (dividerOffset); int endOffset = doc.IndexOf (">>>>>>>", dividerOffset, doc.TextLength - dividerOffset, StringComparison.Ordinal); - LineSegment end = doc.GetLineByOffset (endOffset); + DocumentLine end = doc.GetLineByOffset (endOffset); mergeStart = dividerOffset + 1; yield return new Conflict (new TextSegment (start.EndOffsetIncludingDelimiter, divider.Offset - start.EndOffsetIncludingDelimiter), @@ -169,7 +169,7 @@ namespace MonoDevelop.VersionControl.Views LeftDiff = new List<Mono.TextEditor.Utils.Hunk> (editors[0].Document.Diff (MainEditor.Document)); RightDiff = new List<Mono.TextEditor.Utils.Hunk> (editors[2].Document.Diff (MainEditor.Document)); - LineSegment line; + DocumentLine line; LeftDiff.RemoveAll (item => null != (line = MainEditor.Document.GetLine (item.InsertStart)) && currentConflicts.Any (c => c.StartSegment.Offset <= line.Offset && line.Offset < c.EndSegment.EndOffset)); RightDiff.RemoveAll (item => null != (line = MainEditor.Document.GetLine (item.InsertStart)) && |