[annotatescrollbar addon] Simplify visual-line finding

Issue #6388
codemirror · Aug 19, 2020 · ac4aaa0 · ac4aaa0
1 parent 55d0484
commit ac4aaa0
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/addon/scroll/annotatescrollbar.js b/addon/scroll/annotatescrollbar.js
@@ -73,19 +73,15 @@
     var singleLineH = wrapping && cm.defaultTextHeight() * 1.5;
     var curLine = null, curLineObj = null;
 
-    function getFoldLineHandle(pos) {
-      var marks = cm.findMarksAt(pos);
-      for (var i = 0; i < marks.length; ++i) {
-        if (marks[i].collapsed)
-          return marks[i].lines[0];
-      }
-    }
-
     function getY(pos, top) {
       if (curLine != pos.line) {
-        curLine = pos.line;
-        if(!(curLineObj = getFoldLineHandle(pos)))
-          curLineObj = cm.getLineHandle(curLine);
+        curLine = pos.line
+        curLineObj = cm.getLineHandle(pos.line)
+        var visual = cm.getLineHandleVisualStart(curLineObj)
+        if (visual != curLineObj) {
+          curLine = cm.getLineNumber(visual)
+          curLineObj = visual
+        }
       }
       if ((curLineObj.widgets && curLineObj.widgets.length) ||
           (wrapping && curLineObj.height > singleLineH))