From f1c4eab5509d3afc7b2a0224e0c58d4d193f5341 Mon Sep 17 00:00:00 2001 From: nightwing Date: Sun, 4 Dec 2011 21:03:58 +0400 Subject: [PATCH] cstyle folding throws if matching bracket isn't found --- lib/ace/mode/folding/cstyle.js | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/lib/ace/mode/folding/cstyle.js b/lib/ace/mode/folding/cstyle.js index d44a7de6..e52f70f4 100644 --- a/lib/ace/mode/folding/cstyle.js +++ b/lib/ace/mode/folding/cstyle.js @@ -60,17 +60,17 @@ oop.inherits(FoldMode, BaseFoldMode); var start = {row: row, column: i+1}; var end = session.$findClosingBracket(match[1], start); - if (end) { - var fw = session.foldWidgets[end.row]; - if (fw == null) - fw = this.getFoldWidget(session, end.row); + if (!end) + return; - if (fw == "start"){ - end.row --; - end.column = session.getLine(end.row).length; - } + var fw = session.foldWidgets[end.row]; + if (fw == null) + fw = this.getFoldWidget(session, end.row); + + if (fw == "start") { + end.row --; + end.column = session.getLine(end.row).length; } - return Range.fromPoints(start, end); } @@ -84,10 +84,11 @@ oop.inherits(FoldMode, BaseFoldMode); var end = {row: row, column: i}; var start = session.$findOpeningBracket(match[1], end); - if (start) { - start.column++; - end.column--; - } + if (!start) + return; + + start.column++; + end.column--; return Range.fromPoints(start, end); }