Merge pull request #126 from jojorne/patch-1

Fix buffer index crashes
AvaloniaUI · Jul 10, 2024 · 1a53413 · 1a53413
2 parents c7ae745 + a7b794b
commit 1a53413
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/AvaloniaLSP/AvaloniaLanguageServer/Services/Buffer.cs b/src/AvaloniaLSP/AvaloniaLanguageServer/Services/Buffer.cs
@@ -5,16 +5,15 @@ public sealed class Buffer
 
     public string? GetTextTillLine(Position position)
     {
-        string[] lines = _text.Split(separator, StringSplitOptions.RemoveEmptyEntries);
-        var linesRange = string.Join(string.Empty, lines[0..position.Line]);
-        string lastLine = lines[position.Line];
-
-        return linesRange + lastLine.Substring(0, position.Character);
+        string[] lines = _text.Split(separator, StringSplitOptions.None);
+        string text = string.Join("\n", lines[..position.Line]);
+        string line = lines[position.Line][..position.Character];
+        return $"{text}\n{line}";
     }
 
     public string? GetLine(Position position)
     {
-        string[] lines = _text.Split(separator, StringSplitOptions.RemoveEmptyEntries);
+        string[] lines = _text.Split(separator, StringSplitOptions.None);
         return lines[position.Line];
     }
 
@@ -27,4 +26,4 @@ public Buffer(string text)
 
     readonly string _text;
     private static readonly string[] separator = ["\n", "\r\n"];
-}
+}