Merge commit '913281dda7d9a65f1ac04aa80ba723af7a2fd699'

Author: lindexi

LightTextEditorPlus/Demos/AvaloniaDemo/Business/RichTextCases/RichTextCaseProvider.cs

@@ -533,6 +533,16 @@ void Append(string text, double fontSize)
             }));
         }, "1d0299-使用 rr.导致字符宽度计算错误");
 
+        Add(editor =>
+        {
+            editor.UseWpfLineSpacingStyle();
+            editor.AppendRun(new SkiaTextRun("ڸڸ  ", editor.StyleRunProperty with
+            {
+                FontSize = 20,
+                FontName = new FontName("Segoe UI"),
+            }));
+        }, "a5e370b-包含从右到左的字符时，将出现越界错误");
+
         //Add(editor =>
         //{
         //    editor.UseWpfLineSpacingStyle();

LightTextEditorPlus/Docs/问题列表/a5e370b-包含从右到左的字符时，将出现越界错误/问题描述.md

@@ -0,0 +1,7 @@
+测试版本： a5e370b84f7fec1617d6ef4142504c8901bf865e
+
+问题描述：
+
+包含从右到左的字符时，将出现越界错误
+
+问题原因： 在 SkiaCharInfoMeasurer 的 SetCharDataInfo 为了处理连写字的时候，取了字符信息，而此时字符排序是逆序，导致越界

LightTextEditorPlus/LightTextEditorPlus.Core/Utils/ReadOnlyCharDataList_/ReadOnlyCharDataListExtension.cs

@@ -2,9 +2,11 @@
 using System.Buffers;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using System.Text;
 
 using LightTextEditorPlus.Core.Document;
+using LightTextEditorPlus.Core.Primitive;
 using LightTextEditorPlus.Core.Primitive.Collections;
 using LightTextEditorPlus.Core.Utils.TextArrayPools;
 
@@ -177,30 +179,91 @@ public static TextReadOnlyListSpan<CharData> GetFirstCharSpanContinuous(this Tex
         }
 
         var count = 1;
-        var current = charList[0];
-        for (int i = 1; i < charList.Count; i++)
+
+        if (checker is null)
         {
-            var next = charList[i];
-            if (checker is null)
+            var current = charList[0];
+            var currentStrongDirection = GetStrongFlowDirection(charList[0]);
+            for (int i = 1; i < charList.Count; i++)
             {
+                var next = charList[i];
                 if (!current.RunProperty.Equals(next.RunProperty))
                 {
                     break;
                 }
+
+                var nextStrongDirection = GetStrongFlowDirection(next);
+                if (nextStrongDirection.HasValue)
+                {
+                    if (currentStrongDirection.HasValue && currentStrongDirection.Value != nextStrongDirection.Value)
+                    {
+                        break;
+                    }
+
+                    currentStrongDirection = nextStrongDirection;
+                }
+
+                count++;
+                current = next;
             }
-            else
+        }
+        else
+        {
+            var current = charList[0];
+            for (int i = 1; i < charList.Count; i++)
             {
+                var next = charList[i];
                 if (!checker(current, next))
                 {
                     break;
                 }
+
+                count++;
+                current = next;
             }
-            count++;
-            current = next; // 这步有些多余，但是为了代码的可读性，还是加上了。为什么多余？因此此时 current 必定和 next 相等
         }
 
         return charList.Slice(0, count);
     }
+
+    /// <summary>
+    /// 获取当前的文本方向
+    /// </summary>
+    /// <param name="charData"></param>
+    /// <returns></returns>
+    private static FlowDirection? GetStrongFlowDirection(CharData charData)
+    {
+        var rune = charData.CharObject.CodePoint.Rune;
+        UnicodeCategory category = Rune.GetUnicodeCategory(rune);
+
+        if (category is not (UnicodeCategory.UppercaseLetter
+            or UnicodeCategory.LowercaseLetter
+            or UnicodeCategory.TitlecaseLetter
+            or UnicodeCategory.ModifierLetter
+            or UnicodeCategory.OtherLetter))
+        {
+            return null;
+        }
+
+        return IsRightToLeftScript(charData.CharObject.CodePoint.Value)
+            ? FlowDirection.RightToLeft
+            : FlowDirection.LeftToRight;
+    }
+
+    /// <summary>
+    /// 是否在从右到左范围内
+    /// </summary>
+    /// <param name="codePoint"></param>
+    /// <returns></returns>
+    private static bool IsRightToLeftScript(int codePoint)
+    {
+        return codePoint is
+            >= 0x0590 and <= 0x08FF // Hebrew, Arabic, Syriac, Thaana 等
+            or >= 0xFB1D and <= 0xFDFF // Hebrew/Arabic Presentation Forms-A
+            or >= 0xFE70 and <= 0xFEFF // Arabic Presentation Forms-B
+            or >= 0x1E900 and <= 0x1E95F // Adlam
+            or >= 0x1EE00 and <= 0x1EEFF; // Arabic Mathematical Alphabetic Symbols
+    }
 }
 
 /// <summary>