Fix some failing tests

Author: Gillibald

src/Avalonia.Controls/Presenters/TextPresenter.cs

@@ -215,7 +215,6 @@ public int CaretIndex
             set
             {
                 value = CoerceCaretIndex(value);
-                _caretBounds = TextLayout.GetRectFromCharacterIndex(value, true);
                 SetAndRaise(CaretIndexProperty, ref _caretIndex, value);
             }
         }
@@ -281,7 +280,7 @@ public int SelectionEnd
         public int GetCaretIndex(Point point)
         {
             var hit = TextLayout.HitTestPoint(point);
-            _caretBounds = hit.CaretBounds;
+            _caretBounds = TextLayout.GetRectFromCharacterIndex(hit.TextPosition, hit.IsTrailing);
             _navigationPosition = _caretBounds.Position;
             return hit.TextPosition;
         }
@@ -485,15 +484,15 @@ protected virtual TextLayout CreateTextLayout()
 
             IReadOnlyList<ValueSpan<TextRunProperties>> textStyleOverrides = null;
 
-            /*if (length > 0)
+            if (length > 0)
             {
                 textStyleOverrides = new[]
                 {
                     new ValueSpan<TextRunProperties>(start, length,
                         new GenericTextRunProperties(typeface, FontSize,
                             foregroundBrush: SelectionForegroundBrush ?? Brushes.White))
                 };
-            }*/
+            }
 
             if (PasswordChar != default(char) && !RevealPassword)
             {
@@ -599,12 +598,16 @@ public void MoveCaretVertical(LogicalDirection direction = LogicalDirection.Forw
 
             CaretIndex = caretIndex;
 
+            _caretBounds = TextLayout.GetRectFromCharacterIndex(caretIndex, false);
+            
             _navigationPosition = _navigationPosition.WithY(_caretBounds.Y);
         }
 
         public void MoveCaretHorizontal(LogicalDirection direction = LogicalDirection.Forward)
         {
             var caretIndex = CaretIndex;
+
+            CharacterHit characterHit = default;
 
             var lineIndex = TextLayout.GetLineIndexFromCharacterIndex(caretIndex);
 
@@ -619,10 +622,17 @@ public void MoveCaretHorizontal(LogicalDirection direction = LogicalDirection.Fo
                 {
                     var textLine = TextLayout.TextLines[lineIndex];
 
-                    var characterHit = textLine.GetNextCaretCharacterHit(new CharacterHit(caretIndex));
+                    characterHit = textLine.GetNextCaretCharacterHit(new CharacterHit(caretIndex));
 
                     caretIndex = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
 
+                    if (caretIndex - textLine.TrailingWhitespaceLength == textLine.TextRange.End)
+                    {
+                        characterHit = new CharacterHit(caretIndex);
+                        
+                        break;
+                    }
+                    
                     if (caretIndex <= CaretIndex)
                     {
                         lineIndex++;
@@ -639,7 +649,7 @@ public void MoveCaretHorizontal(LogicalDirection direction = LogicalDirection.Fo
                 {
                     var textLine = TextLayout.TextLines[lineIndex];
 
-                    var characterHit = textLine.GetPreviousCaretCharacterHit(new CharacterHit(caretIndex));
+                    characterHit = textLine.GetPreviousCaretCharacterHit(new CharacterHit(caretIndex));
 
                     caretIndex = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
 
@@ -656,6 +666,8 @@ public void MoveCaretHorizontal(LogicalDirection direction = LogicalDirection.Fo
 
             CaretIndex = caretIndex;
 
+            _caretBounds = TextLayout.GetRectFromCharacterIndex(caretIndex, characterHit.TrailingLength > 0);
+
             _navigationPosition = _caretBounds.Position;
         }
 

src/Avalonia.Visuals/Media/TextFormatting/TextFormatterImpl.cs

@@ -219,7 +219,7 @@ internal static SplitTextRunsResult SplitTextRuns(List<ShapedTextCharacters> tex
 
                     if (second != null)
                     {
-                        var offset = currentRun.GlyphRun.Characters.Length > 1 ? 1 : 0;
+                        var offset = currentRun.GlyphRun.Characters.Length >= 1 ? 1 : 0;
 
                         for (var j = 0; j < secondCount; j++)
                         {
@@ -514,7 +514,10 @@ private static TextLine PerformTextWrapping(List<ShapedTextCharacters> textRuns,
                         break;
                     }
 
-                    lastWrapPosition = currentLength + lineBreaker.Current.PositionWrap;
+                    if (lineBreaker.Current.PositionMeasure != lineBreaker.Current.PositionWrap)
+                    {
+                        lastWrapPosition = currentLength + lineBreaker.Current.PositionWrap;
+                    }
                 }
 
                 if (!breakFound)

src/Avalonia.Visuals/Media/TextFormatting/TextLayout.cs

@@ -262,7 +262,7 @@ private TextHitTestResult GetHitTestResult(TextLine textLine, CharacterHit chara
             var lastTrailingIndex = textLine.TextRange.Start + textLine.TextRange.Length;
 
             var isInside = x >= 0 && x <= textLine.Width && y >= 0 && y <= textLine.Height;
-
+            
             if (x >= textLine.Width && textLine.TextRange.Length > 0 && textLine.NewLineLength > 0)
             {
                 lastTrailingIndex -= textLine.NewLineLength;
@@ -272,7 +272,7 @@ private TextHitTestResult GetHitTestResult(TextLine textLine, CharacterHit chara
 
             var isTrailing = lastTrailingIndex == textPosition && characterHit.TrailingLength > 0 ||
                              y > Size.Height;
-
+            
             if (textPosition == textLine.TextRange.Start + textLine.TextRange.Length)
             {
                 textPosition -= textLine.NewLineLength;
@@ -528,7 +528,8 @@ public Rect GetRectFromCharacterIndex(int characterIndex, bool trailingEdge)
 
             foreach (var textLine in TextLines)
             {
-                if (currentIndex + textLine.TextRange.Length < characterIndex)
+                if (currentIndex + textLine.TextRange.Length <= characterIndex && !trailingEdge ||
+                    currentIndex + textLine.TextRange.Length < characterIndex)
                 {
                     distanceY += textLine.Height;
 

src/Avalonia.Visuals/Media/TextHitTestResult.cs

@@ -14,11 +14,6 @@ public class TextHitTestResult
         /// Gets the index of the hit character in the text.
         /// </summary>
         public int TextPosition { get; set; }
-        
-        /// <summary>
-        /// Gets the caret position.
-        /// </summary>
-        public Rect CaretBounds { get; set; }
 
         /// <summary>
         /// Gets a value indicating whether the hit is on the trailing edge of the character.

tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs

@@ -67,8 +67,10 @@ public void Should_Apply_TextStyleSpan_To_Text_In_Between()
             }
         }
 
-        [Fact]
-        public void Should_Wrap_And_Apply_Style()
+        [InlineData(27)]
+        [InlineData(22)]
+        [Theory]
+        public void Should_Wrap_And_Apply_Style(int length)
         {
             using (Start())
             {
@@ -89,7 +91,7 @@ public void Should_Wrap_And_Apply_Style()
 
                 var spans = new[]
                 {
-                    new ValueSpan<TextRunProperties>(0, 27,
+                    new ValueSpan<TextRunProperties>(0, length,
                         new GenericTextRunProperties(Typeface.Default, 12, foregroundBrush: foreground))
                 };