cstyle folding throws if matching bracket isn't found
This commit is contained in:
parent
c4bdcd8bad
commit
f1c4eab550
1 changed files with 14 additions and 13 deletions
|
|
@ -60,17 +60,17 @@ oop.inherits(FoldMode, BaseFoldMode);
|
||||||
|
|
||||||
var start = {row: row, column: i+1};
|
var start = {row: row, column: i+1};
|
||||||
var end = session.$findClosingBracket(match[1], start);
|
var end = session.$findClosingBracket(match[1], start);
|
||||||
if (end) {
|
if (!end)
|
||||||
var fw = session.foldWidgets[end.row];
|
return;
|
||||||
if (fw == null)
|
|
||||||
fw = this.getFoldWidget(session, end.row);
|
|
||||||
|
|
||||||
if (fw == "start"){
|
var fw = session.foldWidgets[end.row];
|
||||||
end.row --;
|
if (fw == null)
|
||||||
end.column = session.getLine(end.row).length;
|
fw = this.getFoldWidget(session, end.row);
|
||||||
}
|
|
||||||
|
if (fw == "start") {
|
||||||
|
end.row --;
|
||||||
|
end.column = session.getLine(end.row).length;
|
||||||
}
|
}
|
||||||
|
|
||||||
return Range.fromPoints(start, end);
|
return Range.fromPoints(start, end);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -84,10 +84,11 @@ oop.inherits(FoldMode, BaseFoldMode);
|
||||||
var end = {row: row, column: i};
|
var end = {row: row, column: i};
|
||||||
var start = session.$findOpeningBracket(match[1], end);
|
var start = session.$findOpeningBracket(match[1], end);
|
||||||
|
|
||||||
if (start) {
|
if (!start)
|
||||||
start.column++;
|
return;
|
||||||
end.column--;
|
|
||||||
}
|
start.column++;
|
||||||
|
end.column--;
|
||||||
|
|
||||||
return Range.fromPoints(start, end);
|
return Range.fromPoints(start, end);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue