diff options
| author | nyamatongwe <devnull@localhost> | 2011-07-06 20:41:44 +1000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2011-07-06 20:41:44 +1000 |
| commit | 1df0d69de851eb8953f1c83ef1460c88223465c1 (patch) | |
| tree | 45ce0f37fd9a4f7b65307ef43b1c8897e8a82d9d | |
| parent | f650e7fd9d5596e6c165e02ca5defdb4afc90131 (diff) | |
| download | scintilla-mirror-1df0d69de851eb8953f1c83ef1460c88223465c1.tar.gz | |
Fix problems with folding not extending to final line. Bug #3349157.
From Marko Njezic.
| -rw-r--r-- | lexers/LexPython.cxx | 11 | ||||
| -rw-r--r-- | lexlib/Accessor.cxx | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/lexers/LexPython.cxx b/lexers/LexPython.cxx index 4ed6c92a5..8cb95e1d3 100644 --- a/lexers/LexPython.cxx +++ b/lexers/LexPython.cxx @@ -419,8 +419,8 @@ static bool IsQuoteLine(int line, Accessor &styler) { static void FoldPyDoc(unsigned int startPos, int length, int /*initStyle - unused*/, WordList *[], Accessor &styler) { const int maxPos = startPos + length; - const int maxLines = styler.GetLine(maxPos - 1); // Requested last line - const int docLines = styler.GetLine(styler.Length() - 1); // Available last line + const int maxLines = (maxPos == styler.Length()) ? styler.GetLine(maxPos) : styler.GetLine(maxPos - 1); // Requested last line + const int docLines = styler.GetLine(styler.Length()); // Available last line // property fold.comment.python // This option enables folding multi-line comments when using the Python lexer. @@ -472,14 +472,15 @@ static void FoldPyDoc(unsigned int startPos, int length, int /*initStyle - unuse if (lineNext <= docLines) { // Information about next line is only available if not at end of document indentNext = styler.IndentAmount(lineNext, &spaceFlags, NULL); - int style = styler.StyleAt(styler.LineStart(lineNext)) & 31; + int lookAtPos = (styler.LineStart(lineNext) == styler.Length()) ? styler.Length() - 1 : styler.LineStart(lineNext); + int style = styler.StyleAt(lookAtPos) & 31; quote = foldQuotes && ((style == SCE_P_TRIPLE) || (style == SCE_P_TRIPLEDOUBLE)); } const int quote_start = (quote && !prevQuote); const int quote_continue = (quote && prevQuote); const int comment = foldComment && IsCommentLine(lineCurrent, styler); const int comment_start = (comment && !prevComment && (lineNext <= docLines) && - IsCommentLine(lineNext, styler) && (lev > SC_FOLDLEVELBASE)); + IsCommentLine(lineNext, styler) && ((lev & SC_FOLDLEVELNUMBERMASK) > SC_FOLDLEVELBASE)); const int comment_continue = (comment && prevComment); if ((!quote || !prevQuote) && !comment) indentCurrentLevel = indentCurrent & SC_FOLDLEVELNUMBERMASK; @@ -558,7 +559,7 @@ static void FoldPyDoc(unsigned int startPos, int length, int /*initStyle - unuse prevComment = comment_start || comment_continue; // Set fold level for this line and move to next line - styler.SetLevel(lineCurrent, lev); + styler.SetLevel(lineCurrent, foldCompact ? lev : lev & ~SC_FOLDLEVELWHITEFLAG); indentCurrent = indentNext; lineCurrent = lineNext; } diff --git a/lexlib/Accessor.cxx b/lexlib/Accessor.cxx index 5adaaa2f7..65609598f 100644 --- a/lexlib/Accessor.cxx +++ b/lexlib/Accessor.cxx @@ -71,7 +71,7 @@ int Accessor::IndentAmount(int line, int *flags, PFNIsCommentLeader pfnIsComment *flags = spaceFlags; indent += SC_FOLDLEVELBASE; // if completely empty line or the start of a comment... - if ((ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r') || + if ((LineStart(line) == Length()) || (ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r') || (pfnIsCommentLeader && (*pfnIsCommentLeader)(*this, pos, end-pos))) return indent | SC_FOLDLEVELWHITEFLAG; else |