Merge branch 'master' into bump-textmate-sharp

AvaloniaUI · Jul 29, 2024 · 89c9018 · 89c9018
2 parents 44dd24c + 5fa5f8b
commit 89c9018
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/AvaloniaEdit.TextMate/Compatibility/Math.cs b/src/AvaloniaEdit.TextMate/Compatibility/Math.cs
@@ -0,0 +1,11 @@
+namespace AvaloniaEdit.TextMate.Compatibility
+{
+    internal static class Math
+    {
+        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
+        public static int Clamp(int value, int min, int max)
+        {
+            return (value < min) ? min : (value > max) ? max : value;
+        }
+    }
+}
diff --git a/src/AvaloniaEdit.TextMate/TextEditorModel.cs b/src/AvaloniaEdit.TextMate/TextEditorModel.cs
@@ -7,6 +7,12 @@
 
 using TextMateSharp.Model;
 
+#if NET6_0_OR_GREATER
+using Math = System.Math;
+#else
+using Math = AvaloniaEdit.TextMate.Compatibility.Math;
+#endif
+
 namespace AvaloniaEdit.TextMate
 {
     public class TextEditorModel : AbstractLineList, IDisposable
@@ -168,7 +174,9 @@ void DocumentOnUpdateFinished(object sender, EventArgs e)
 
             try
             {
-                InvalidateLineRange(_invalidRange.StartLine, _invalidRange.EndLine);
+                int startLine = Math.Clamp(_invalidRange.StartLine, 0, _documentSnapshot.LineCount - 1);
+                int endLine = Math.Clamp(_invalidRange.EndLine, 0, _documentSnapshot.LineCount - 1);
+                InvalidateLineRange(startLine, endLine);
             }
             finally
             {