diff options
| -rw-r--r-- | doc/ScintillaHistory.html | 5 | ||||
| -rw-r--r-- | lexers/LexCPP.cxx | 30 |
2 files changed, 25 insertions, 10 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 164563cbb..b8225bcc5 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -557,6 +557,11 @@ <li> The Bash lexer implements substyles for multiple sets of keywords and supports SCI_PROPERTYNAMES. <a href="https://sourceforge.net/p/scintilla/bugs/2054/">Bug #2054</a>. + <li> + The C++ lexer interprets continued preprocessor lines correctly by reading all of + the logical line. + <a href="https://sourceforge.net/p/scintilla/bugs/2062/">Bug #2062</a>. + </li> </li> <li> Notify with SC_UPDATE_SELECTION when user performs a multiple selection add. diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx index 3dac142ab..e8cb75e43 100644 --- a/lexers/LexCPP.cxx +++ b/lexers/LexCPP.cxx @@ -201,17 +201,27 @@ struct EscapeSequence { std::string GetRestOfLine(LexAccessor &styler, Sci_Position start, bool allowSpace) { std::string restOfLine; - Sci_Position i =0; + Sci_Position line = styler.GetLine(start); + Sci_Position pos = start; + Sci_Position endLine = styler.LineEnd(line); char ch = styler.SafeGetCharAt(start, '\n'); - const Sci_Position endLine = styler.LineEnd(styler.GetLine(start)); - while (((start+i) < endLine) && (ch != '\r')) { - const char chNext = styler.SafeGetCharAt(start + i + 1, '\n'); - if (ch == '/' && (chNext == '/' || chNext == '*')) - break; - if (allowSpace || (ch != ' ')) - restOfLine += ch; - i++; - ch = chNext; + while (pos < endLine) { + if (ch == '\\' && ((pos + 1) == endLine)) { + // Continuation line + line++; + pos = styler.LineStart(line); + endLine = styler.LineEnd(line); + ch = styler.SafeGetCharAt(pos, '\n'); + } else { + const char chNext = styler.SafeGetCharAt(pos + 1, '\n'); + if (ch == '/' && (chNext == '/' || chNext == '*')) + break; + if (allowSpace || (ch != ' ')) { + restOfLine += ch; + } + pos++; + ch = chNext; + } } return restOfLine; } |