Merge pull request #140 from jimfoye/jimfoye-patch-fix12

jogibear9988 · web-flow · commit 690b92d4e6d0 · 2019-09-01T10:19:16.000+02:00
Fix #12, End key behavior and trailing whitespace
diff --git a/ICSharpCode.AvalonEdit/Editing/CaretNavigationCommandHandler.cs b/ICSharpCode.AvalonEdit/Editing/CaretNavigationCommandHandler.cs
@@ -262,7 +262,7 @@ static TextViewPosition GetStartOfLineCaretPosition(int oldVC, VisualLine visual
 
 		static TextViewPosition GetEndOfLineCaretPosition(VisualLine visualLine, TextLine textLine)
 		{
-			int newVC = visualLine.GetTextLineVisualStartColumn(textLine) + textLine.Length - textLine.TrailingWhitespaceLength;
+			int newVC = visualLine.GetTextLineVisualStartColumn(textLine) + textLine.Length - textLine.NewlineLength;
 			TextViewPosition pos = visualLine.GetTextViewPosition(newVC);
 			pos.IsAtEndOfLine = true;
 			return pos;

Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ static TextViewPosition GetStartOfLineCaretPosition(int oldVC, VisualLine visual`
`262`	`262`
`263`	`263`	`static TextViewPosition GetEndOfLineCaretPosition(VisualLine visualLine, TextLine textLine)`
`264`	`264`	`{`
`265`		`- int newVC = visualLine.GetTextLineVisualStartColumn(textLine) + textLine.Length - textLine.TrailingWhitespaceLength;`
	`265`	`+ int newVC = visualLine.GetTextLineVisualStartColumn(textLine) + textLine.Length - textLine.NewlineLength;`
`266`	`266`	`TextViewPosition pos = visualLine.GetTextViewPosition(newVC);`
`267`	`267`	`pos.IsAtEndOfLine = true;`
`268`	`268`	`return pos;`