diff options
| author | Neil <nyamatongwe@gmail.com> | 2013-10-17 09:45:03 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2013-10-17 09:45:03 +1100 |
| commit | a4fe8bd8aa80d91f3fc356cb4284b30d8c602d97 (patch) | |
| tree | afd6cf5f3d4476390092250c76afac97ed39012b | |
| parent | 2ea6c7a4afc359fe3ce15291a81750828f05e85b (diff) | |
| download | scintilla-mirror-a4fe8bd8aa80d91f3fc356cb4284b30d8c602d97.tar.gz | |
Bug [#1538]. PP-line comments lost from EOL string.
From Alpha.
| -rw-r--r-- | doc/ScintillaHistory.html | 12 | ||||
| -rw-r--r-- | lexers/LexCPP.cxx | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index b54522bc7..98debdbb5 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -444,6 +444,18 @@ </li> </ul> <h3> + <a href="http://prdownloads.sourceforge.net/scintilla/scite337.zip?download">Release 3.3.7</a> + </h3> + <ul> + <li> + Released 15 October 2013. + </li> + <li> + C++ lexer fixes bug with #include statements without " or > terminating filename. + <a href="http://sourceforge.net/p/scintilla/bugs/1538/">Bug #1538</a>. + </li> + <ul> + <h3> <a href="http://prdownloads.sourceforge.net/scintilla/scite336.zip?download">Release 3.3.6</a> </h3> <ul> diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx index 6f7afc23d..edf415ca4 100644 --- a/lexers/LexCPP.cxx +++ b/lexers/LexCPP.cxx @@ -685,7 +685,7 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle, if (IsASpace(sc.ch)) { sc.SetState(SCE_C_DEFAULT|activitySet); } - } else if (isStringInPreprocessor && (sc.Match('>') || sc.Match('\"'))) { + } else if (isStringInPreprocessor && (sc.Match('>') || sc.Match('\"') || sc.atLineEnd)) { isStringInPreprocessor = false; } else if (!isStringInPreprocessor) { if ((isIncludePreprocessor && sc.Match('<')) || sc.Match('\"')) { |