From f7f60365ebc8eb5ae328f93def6751e169f99b5c Mon Sep 17 00:00:00 2001 From: Martin Kleusberg Date: Fri, 11 Aug 2017 17:58:51 +0200 Subject: [PATCH] libs: Fix wrong syntax highlighting in Scintilla lexer code See issue #1080. --- libs/DB4S_PATCHES | 13 +++++++++++++ libs/qscintilla/lexers/LexSQL.cpp | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 libs/DB4S_PATCHES diff --git a/libs/DB4S_PATCHES b/libs/DB4S_PATCHES new file mode 100644 index 00000000..689fe458 --- /dev/null +++ b/libs/DB4S_PATCHES @@ -0,0 +1,13 @@ +diff --git a/libs/qscintilla/lexers/LexSQL.cpp b/libs/qscintilla/lexers/LexSQL.cpp +index 1d00918..086955a 100644 +--- a/libs/qscintilla/lexers/LexSQL.cpp ++++ b/libs/qscintilla/lexers/LexSQL.cpp +@@ -546,7 +546,7 @@ void SCI_METHOD LexerSQL::Lex(Sci_PositionU startPos, Sci_Position length, int i + } + break; + case SCE_SQL_STRING: +- if (sc.ch == '\\') { ++ if (options.sqlBackslashEscapes && sc.ch == '\\') { + // Escape sequence + sc.Forward(); + } else if (sc.ch == '\"') { diff --git a/libs/qscintilla/lexers/LexSQL.cpp b/libs/qscintilla/lexers/LexSQL.cpp index 1d009180..086955ac 100644 --- a/libs/qscintilla/lexers/LexSQL.cpp +++ b/libs/qscintilla/lexers/LexSQL.cpp @@ -546,7 +546,7 @@ void SCI_METHOD LexerSQL::Lex(Sci_PositionU startPos, Sci_Position length, int i } break; case SCE_SQL_STRING: - if (sc.ch == '\\') { + if (options.sqlBackslashEscapes && sc.ch == '\\') { // Escape sequence sc.Forward(); } else if (sc.ch == '\"') {