aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--doc/ScintillaHistory.html4
-rw-r--r--lexers/LexCPP.cxx4
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index b3b417d19..4b73b1d18 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -505,6 +505,10 @@
SciTE allows setting the autocompletion type separator character.
</li>
<li>
+ The C++ folder folds code on '(' and ')' to allow multi-line calls to be folded.
+ <a href="http://sourceforge.net/p/scintilla/feature-requests/1138/">Feature #1138.</a>
+ </li>
+ <li>
For the HTML lexer, limit the extent of Mako line comments to finish before
the line end characters.
</li>
diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx
index fc9b5b86b..76190002a 100644
--- a/lexers/LexCPP.cxx
+++ b/lexers/LexCPP.cxx
@@ -1349,14 +1349,14 @@ void SCI_METHOD LexerCPP::Fold(Sci_PositionU startPos, Sci_Position length, int
}
}
if (options.foldSyntaxBased && (style == SCE_C_OPERATOR)) {
- if (ch == '{' || ch == '[') {
+ if (ch == '{' || ch == '[' || ch == '(') {
// Measure the minimum before a '{' to allow
// folding on "} else {"
if (levelMinCurrent > levelNext) {
levelMinCurrent = levelNext;
}
levelNext++;
- } else if (ch == '}' || ch == ']') {
+ } else if (ch == '}' || ch == ']' || ch == ')') {
levelNext--;
}
}