Desktop,Mobile: Plugins: Legacy editor API: Fix delayed crash caused …

…by out-of-bounds inputs See laurent22#11710
personalizedrefrigerator · Jan 23, 2025 · 9b3c3cc · 9b3c3cc
1 parent 877123b
commit 9b3c3cc
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/packages/editor/CodeMirror/CodeMirror5Emulation/CodeMirror5Emulation.test.ts b/packages/editor/CodeMirror/CodeMirror5Emulation/CodeMirror5Emulation.test.ts
@@ -185,4 +185,20 @@ describe('CodeMirror5Emulation', () => {
 
 		expect(lastThis).toBe(codeMirror);
 	});
+
+	it('.markText should support specifying ranges outside the document', () => {
+		const codeMirror = makeCodeMirrorEmulation('Test...');
+
+		const testClassName = 'out-of-range-test-mark';
+		codeMirror.markText(
+			// In range
+			{ line: 0, ch: 4 },
+			// Out of range
+			{ line: 0, ch: 1002 },
+			{ className: testClassName },
+		);
+
+		const dom = codeMirror.editor.dom;
+		expect(dom.querySelectorAll(`.${testClassName}`)).toHaveLength(1);
+	});
 });
diff --git a/packages/editor/CodeMirror/CodeMirror5Emulation/CodeMirror5Emulation.ts b/packages/editor/CodeMirror/CodeMirror5Emulation/CodeMirror5Emulation.ts
@@ -37,6 +37,10 @@ interface DocumentPositionRange {
 	to: DocumentPosition;
 }
 
+const clampPositionToDoc = (doc: Text, pos: number) => {
+	return Math.min(Math.max(0, pos), doc.length);
+};
+
 const documentPositionFromPos = (doc: Text, pos: number): DocumentPosition => {
 	const line = doc.lineAt(pos);
 	return {
@@ -420,8 +424,8 @@ export default class CodeMirror5Emulation extends BaseCodeMirror5Emulation {
 		const doc = this.editor.state.doc;
 
 		return this._decorator.markText(
-			posFromDocumentPosition(doc, from),
-			posFromDocumentPosition(doc, to),
+			clampPositionToDoc(doc, posFromDocumentPosition(doc, from)),
+			clampPositionToDoc(doc, posFromDocumentPosition(doc, to)),
 			options,
 		);
 	}