diff options
| author | Zufu Liu <unknown> | 2019-06-25 12:07:19 +1000 |
|---|---|---|
| committer | Zufu Liu <unknown> | 2019-06-25 12:07:19 +1000 |
| commit | 330f1e0c7e6270612620ec049dc239fea3c6debc (patch) | |
| tree | c0aa8fec38ad185546615fccfb1894b469f5d959 | |
| parent | 9396cc9c1f5781c3aca8b3b9f064d1046734dd1b (diff) | |
| download | scintilla-mirror-330f1e0c7e6270612620ec049dc239fea3c6debc.tar.gz | |
Bug [#2098]. Fix single quoted strings where '" (quote, double quote) was seen
as continuing the string.
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | lexers/LexSQL.cxx | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index b160a52c4..203911a90 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -578,6 +578,10 @@ <a href="https://sourceforge.net/p/scintilla/bugs/2112/">Bug #2112</a>. </li> <li> + SQL lexer fixes single quoted strings where '" (quote, double quote) was seen as continuing the string. + <a href="https://sourceforge.net/p/scintilla/bugs/2098/">Bug #2098</a>. + </li> + <li> Platform layers should use InsertCharacter method to perform keyboard and IME input, replacing AddCharUTF method. <a href="https://sourceforge.net/p/scintilla/feature-requests/1293/">Feature #1293</a>. diff --git a/lexers/LexSQL.cxx b/lexers/LexSQL.cxx index 69916b9fb..40d7e1f03 100644 --- a/lexers/LexSQL.cxx +++ b/lexers/LexSQL.cxx @@ -537,7 +537,7 @@ void SCI_METHOD LexerSQL::Lex(Sci_PositionU startPos, Sci_Position length, int i if (options.sqlBackslashEscapes && sc.ch == '\\') { sc.Forward(); } else if (sc.ch == '\'') { - if (sc.chNext == '\"') { + if (sc.chNext == '\'') { sc.Forward(); } else { sc.ForwardSetState(SCE_SQL_DEFAULT); |