From 70bd32a6866f57925989c38932a3769fb6d5adae Mon Sep 17 00:00:00 2001
From: zaaarf <zaaarf@proton.me>
Date: Tue, 28 Nov 2023 01:49:05 +0100
Subject: [PATCH] fix: ignore all out of bounds cursor errors, we don't need
 100% accuracy on that

---
 .../intellij/task/BufferEventAwaiterTask.java |  3 +-
 .../intellij/task/CursorEventAwaiterTask.java | 30 +++++++++++--------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/codemp/intellij/task/BufferEventAwaiterTask.java b/src/main/java/com/codemp/intellij/task/BufferEventAwaiterTask.java
index 44fceed..d602b8f 100644
--- a/src/main/java/com/codemp/intellij/task/BufferEventAwaiterTask.java
+++ b/src/main/java/com/codemp/intellij/task/BufferEventAwaiterTask.java
@@ -1,6 +1,7 @@
 package com.codemp.intellij.task;
 
 import com.codemp.intellij.CodeMP;
+import com.codemp.intellij.exceptions.lib.ChannelException;
 import com.codemp.intellij.exceptions.lib.DeadlockedException;
 import com.codemp.intellij.jni.BufferHandler;
 import com.codemp.intellij.jni.CodeMPHandler;
@@ -94,7 +95,7 @@ public class BufferEventAwaiterTask extends Task.Backgroundable implements Dispo
 							bufferEditor.getDocument()
 					)));
 			}
-		} catch(Exception ex) {
+		} catch(ChannelException ex) { //exited
 			TaskManager.nullBufferTask();
 			Disposer.dispose(this); //stopped
 		}
diff --git a/src/main/java/com/codemp/intellij/task/CursorEventAwaiterTask.java b/src/main/java/com/codemp/intellij/task/CursorEventAwaiterTask.java
index 8e97c25..038d1fe 100644
--- a/src/main/java/com/codemp/intellij/task/CursorEventAwaiterTask.java
+++ b/src/main/java/com/codemp/intellij/task/CursorEventAwaiterTask.java
@@ -1,6 +1,7 @@
 package com.codemp.intellij.task;
 
 import com.codemp.intellij.CodeMP;
+import com.codemp.intellij.exceptions.lib.ChannelException;
 import com.codemp.intellij.jni.CursorEventWrapper;
 import com.codemp.intellij.jni.CursorHandler;
 import com.codemp.intellij.util.ColorUtil;
@@ -42,7 +43,6 @@ public class CursorEventAwaiterTask extends Task.Backgroundable implements Dispo
 		try {
 			while(true) {
 				CursorEventWrapper event = handler.recv();
-
 				Editor editor = CodeMP.ACTIVE_BUFFERS.get(event.getBuffer());
 				if(editor == null)
 					continue;
@@ -54,11 +54,21 @@ public class CursorEventAwaiterTask extends Task.Backgroundable implements Dispo
 					event.getEndRow(), event.getEndCol(),
 					event.getBuffer());
 
-				int startOffset = editor.getDocument().getLineStartOffset(event.getStartRow()) + event.getStartCol();
-				int endOffset = editor.getDocument().getLineStartOffset(event.getEndRow()) + event.getEndCol();
+				try {
+					int startOffset = editor.getDocument()
+						.getLineStartOffset(event.getStartRow()) + event.getStartCol();
+					int endOffset = editor.getDocument()
+						.getLineStartOffset(event.getEndRow()) + event.getEndCol();
+
+					ApplicationManager.getApplication().invokeLater(() -> {
+						int documentLength = editor.getDocument().getTextLength();
+						if(startOffset > documentLength || endOffset > documentLength) {
+							CodeMP.LOGGER.debug(
+								"Out of bounds cursor: start was {}, end was {}, document length was {}!",
+								startOffset, endOffset, documentLength);
+							return;
+						}
 
-				ApplicationManager.getApplication().invokeLater(() -> {
-					try {
 						RangeHighlighter highlighter = this.highlighterMap.get(event.getUser());
 						if(highlighter != null)
 							highlighter.dispose();
@@ -77,14 +87,10 @@ public class CursorEventAwaiterTask extends Task.Backgroundable implements Dispo
 									Font.PLAIN
 								), HighlighterTargetArea.EXACT_RANGE
 							));
-					} catch(IllegalArgumentException ex) {
-						//suppress if the cursor only exceeds length by one, it's probably just him adding something at EOF
-						if(endOffset - editor.getDocument().getTextLength() != 1)
-							throw ex;
-					}
-				});
+					});
+				} catch(IndexOutOfBoundsException ignored) {}
 			}
-		} catch(Exception ex) { //exited
+		} catch(ChannelException ex) { //exited
 			this.highlighterMap.forEach((s, r) -> r.dispose());
 			TaskManager.nullCursorTask();
 			Disposer.dispose(this);