Fix bug in lineIsHidden test

It would occasionally mark lines as hidden that were needed to display
parts of other lines.

Issue #1161

Author: marijnh

lib/codemirror.js

@@ -1057,8 +1057,9 @@ window.CodeMirror = (function() {
       var lineObj = getLine(doc, lineNo);
       var found = coordsCharInner(cm, lineObj, lineNo, x, y);
       var merged = collapsedSpanAtEnd(lineObj);
-      if (merged && found.ch == lineRight(lineObj))
-        lineNo = merged.find().to.line;
+      var mergedPos = merged && merged.find();
+      if (merged && found.ch >= mergedPos.from.ch)
+        lineNo = mergedPos.to.line;
       else
         return found;
     }
@@ -3360,10 +3361,11 @@ window.CodeMirror = (function() {
         else updateLineHeight(line, 0);
       }
       addMarkedSpan(line, span);
-      if (marker.collapsed && curLine == from.line && lineIsHidden(line))
-        updateLineHeight(line, 0);
       ++curLine;
     });
+    if (marker.collapsed) doc.iter(from.line, to.line + 1, function(line) {
+      if (lineIsHidden(line)) updateLineHeight(line, 0);
+    });
 
     if (marker.readOnly) {
       sawReadOnlySpans = true;
@@ -3538,9 +3540,12 @@ window.CodeMirror = (function() {
         return true;
     }
   }
-  window.lineIsHidden = lineIsHidden;
   function lineIsHiddenInner(line, span) {
-    if (span.to == null || span.marker.inclusiveRight && span.to == line.text.length)
+    if (span.to == null) {
+      var end = span.marker.find().to, endLine = getLine(lineDoc(line), end.line);
+      return lineIsHiddenInner(endLine, getMarkedSpanFor(endLine.markedSpans, span.marker));
+    }
+    if (span.marker.inclusiveRight && span.to == line.text.length)
       return true;
     for (var sp, i = 0; i < line.markedSpans.length; ++i) {
       sp = line.markedSpans[i];
@@ -4083,6 +4088,11 @@ window.CodeMirror = (function() {
     return no;
   }
 
+  function lineDoc(line) {
+    for (var d = line.parent; d.parent; d = d.parent) {}
+    return d;
+  }
+
   function lineAtHeight(chunk, h) {
     var n = 0;
     outer: do {

test/test.js

@@ -543,6 +543,20 @@ testCM("collapsedLines", function(cm) {
   eq(cleared, 1);
 });
 
+testCM("collapsedRangeCoordsChar", function(cm) {
+  var pos_1_3 = cm.charCoords({line: 1, ch: 3});
+  var opts = {collapsed: true, inclusiveLeft: true, inclusiveRight: true};
+  var m1 = cm.markText({line: 0, ch: 0}, {line: 2, ch: 0}, opts);
+  eqPos(cm.coordsChar(pos_1_3), {line: 3, ch: 3});
+  m1.clear();
+  var m1 = cm.markText({line: 0, ch: 0}, {line: 1, ch: 1}, opts);
+  var m2 = cm.markText({line: 1, ch: 1}, {line: 2, ch: 0}, opts);
+  eqPos(cm.coordsChar(pos_1_3), {line: 3, ch: 3});
+  m1.clear(); m2.clear();
+  var m1 = cm.markText({line: 0, ch: 0}, {line: 1, ch: 6}, opts);
+  eqPos(cm.coordsChar(pos_1_3), {line: 3, ch: 3});
+}, {value: "123456\nabcdef\nghijkl\nmnopqr\n"});
+
 testCM("hiddenLinesAutoUnfold", function(cm) {
   var range = foldLines(cm, 1, 3, true), cleared = 0;
   CodeMirror.on(range, "clear", function() {cleared++;});