From b609227f0f8e2a5d431960a708ef0a0a0db79adc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 20 Apr 2016 11:09:20 +0200
Subject: [PATCH] Make findMarks only returns marks that overlap the range
Closes #3958
---
lib/codemirror.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 70e3fec5..6b9b71c7 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7626,9 +7626,9 @@
var spans = line.markedSpans;
if (spans) for (var i = 0; i < spans.length; i++) {
var span = spans[i];
- if (!(span.to != null && lineNo == from.line && from.ch > span.to ||
+ if (!(span.to != null && lineNo == from.line && from.ch >= span.to ||
span.from == null && lineNo != from.line ||
- span.from != null && lineNo == to.line && span.from > to.ch) &&
+ span.from != null && lineNo == to.line && span.from >= to.ch) &&
(!filter || filter(span.marker)))
found.push(span.marker.parent || span.marker);
}
--
GitLab