Skip to content

Commit 1a09978

Browse files
committed
[xml-fold addon] Improve handling of line-broken opening tags
Issue codemirror#5179
1 parent 9cb7b7d commit 1a09978

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

addon/fold/xml-fold.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,14 @@
137137
CodeMirror.registerHelper("fold", "xml", function(cm, start) {
138138
var iter = new Iter(cm, start.line, 0);
139139
for (;;) {
140-
var openTag = toNextTag(iter), end;
141-
if (!openTag || !(end = toTagEnd(iter)) || iter.line != start.line) return;
140+
var openTag = toNextTag(iter)
141+
if (!openTag || iter.line != start.line) return
142+
var end = toTagEnd(iter)
143+
if (!end) return
142144
if (!openTag[1] && end != "selfClose") {
143145
var startPos = Pos(iter.line, iter.ch);
144146
var endPos = findMatchingClose(iter, openTag[2]);
145-
return endPos && {from: startPos, to: endPos.from};
147+
return endPos && cmp(endPos.from, startPos) > 0 ? {from: startPos, to: endPos.from} : null
146148
}
147149
}
148150
});

0 commit comments

Comments
 (0)