From d071c68a8d0e29b317e72b4d6331092c4b120f10 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Wed, 7 Dec 2011 17:59:10 +0100 Subject: [PATCH] Move the list of line delimiters to NewLineFinder. --- .../AvalonEdit/ICSharpCode.AvalonEdit/Document/NewLineFinder.cs | 2 ++ .../ICSharpCode.AvalonEdit/Editing/RectangleSelection.cs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Document/NewLineFinder.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Document/NewLineFinder.cs index 29b2aa8cdf..872db9d62f 100644 --- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Document/NewLineFinder.cs +++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Document/NewLineFinder.cs @@ -12,6 +12,8 @@ namespace ICSharpCode.AvalonEdit.Document { static readonly char[] newline = { '\r', '\n' }; + internal static readonly string[] NewlineStrings = { "\r\n", "\r", "\n" }; + /// /// Gets the location of the next new line character, or SimpleSegment.Invalid /// if none is found. diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/RectangleSelection.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/RectangleSelection.cs index c85354967b..a1f9de6094 100644 --- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/RectangleSelection.cs +++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/RectangleSelection.cs @@ -210,7 +210,7 @@ namespace ICSharpCode.AvalonEdit.Editing textArea.Selection = new RectangleSelection(textArea, pos, Math.Max(startLine, endLine), GetXPos(textArea, pos)); } else { - string[] lines = newText.Split(new[] { "\r\n", "\r", "\n" }, segments.Count, StringSplitOptions.None); + string[] lines = newText.Split(NewLineFinder.NewlineStrings, segments.Count, StringSplitOptions.None); int line = Math.Min(startLine, endLine); for (int i = lines.Length - 1; i >= 0; i--) { ReplaceSingleLineText(textArea, segments[i], lines[i], out insertionLength);