Remove deprecated rangeLength (#254)

georgewfraser · Jul 6, 2023 · 9a663e8 · 9a663e8
1 parent 4b17be5
commit 9a663e8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/main/java/org/javacs/FileStore.java b/src/main/java/org/javacs/FileStore.java
@@ -330,7 +330,17 @@ private static String patch(String sourceText, TextDocumentContentChangeEvent ch
             writer.write(change.text);
 
             // Skip replaced text
-            reader.skip(change.rangeLength);
+            if (change.range.start.line == change.range.end.line) {
+                int chars = change.range.end.character - change.range.start.character;
+                reader.skip(chars);
+            } else {
+                int lines = change.range.end.line - change.range.start.line;
+                int chars = change.range.end.character;
+                for (int lineSkip = 0; lineSkip < lines; lineSkip++) {
+                    reader.readLine();                    
+                }
+                reader.skip(chars);
+            }
 
             // Write remaining text
             while (true) {

diff --git a/src/main/java/org/javacs/lsp/TextDocumentContentChangeEvent.java b/src/main/java/org/javacs/lsp/TextDocumentContentChangeEvent.java
@@ -2,6 +2,5 @@
 
 public class TextDocumentContentChangeEvent {
     public Range range;
-    public Integer rangeLength;
     public String text;
 }