Merge branch 'master' into fix/attached-property-name-generation

src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs

@@ -216,7 +216,7 @@ namespace Avalonia.Media.TextFormatting
 
                 if (_paragraphProperties.FlowDirection == FlowDirection.LeftToRight)
                 {
-                    currentPosition = lineLength - lastRun.Length;
+                    currentPosition = FirstTextSourceIndex + Length - lastRun.Length;
                 }
 
                 return GetRunCharacterHit(lastRun, currentPosition, distance);

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

@@ -713,7 +713,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                 var characterHit = textLine.GetCharacterHitFromDistance(1000);
 
-                Assert.Equal(10, characterHit.FirstCharacterIndex);
+                Assert.Equal(11, characterHit.FirstCharacterIndex);
                 Assert.Equal(1, characterHit.TrailingLength);
             }
         }
@@ -822,6 +822,26 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
             }
         }
 
+        [Fact]
+        public void Should_GetCharacterHitFromDistance_From_Mixed_TextBuffer()
+        {
+            using (Start())
+            {
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+                var textSource = new MixedTextBufferTextSource();
+
+                var formatter = new TextFormatterImpl();
+
+                var textLine =
+                    formatter.FormatLine(textSource, 20, double.PositiveInfinity,
+                        new GenericTextParagraphProperties(defaultProperties));
+
+                var characterHit = textLine.GetCharacterHitFromDistance(double.PositiveInfinity);
+
+                Assert.Equal(40, characterHit.FirstCharacterIndex + characterHit.TrailingLength);
+            }
+        }
+
         private class MixedTextBufferTextSource : ITextSource
         {
             public TextRun? GetTextRun(int textSourceIndex)