diff options
| author | XhmikosR <xhmikosr@gmail.com> | 2015-03-07 12:05:41 +0200 |
|---|---|---|
| committer | XhmikosR <xhmikosr@gmail.com> | 2015-03-09 08:44:41 +0200 |
| commit | 4ac30880a3dd4769bb5f1287e90aa0db9ede212c (patch) | |
| tree | 7d237930bb68fc714efc6945eae98ae7df3f6dbe /scintilla/lexers/LexSQL.cxx | |
| parent | 12949f79fc6487022b0ffea17dd9eadd43d5b1c0 (diff) | |
| download | notepad2-mod-4ac30880a3dd4769bb5f1287e90aa0db9ede212c.zip notepad2-mod-4ac30880a3dd4769bb5f1287e90aa0db9ede212c.tar.gz notepad2-mod-4ac30880a3dd4769bb5f1287e90aa0db9ede212c.tar.bz2 | |
Update Scintilla to v3.5.4.4.2.25.945
Diffstat (limited to 'scintilla/lexers/LexSQL.cxx')
| -rw-r--r-- | scintilla/lexers/LexSQL.cxx | 50 |
1 files changed, 27 insertions, 23 deletions
diff --git a/scintilla/lexers/LexSQL.cxx b/scintilla/lexers/LexSQL.cxx index 3c3ded0..713a3c0 100644 --- a/scintilla/lexers/LexSQL.cxx +++ b/scintilla/lexers/LexSQL.cxx @@ -444,7 +444,6 @@ void SCI_METHOD LexerSQL::Lex(unsigned int startPos, int length, int initStyle, StyleContext sc(startPos, length, initStyle, styler);
int styleBeforeDCKeyword = SCE_SQL_DEFAULT;
int offset = 0;
- char qOperator = 0x00;
for (; sc.More(); sc.Forward(), offset++) {
// Determine if the current state should terminate.
@@ -559,29 +558,34 @@ void SCI_METHOD LexerSQL::Lex(unsigned int startPos, int length, int initStyle, }
break;
case SCE_SQL_QOPERATOR:
- if (qOperator == 0x00) {
- qOperator = sc.ch;
- } else {
- char qComplement = 0x00;
-
- if (qOperator == '<') {
- qComplement = '>';
- } else if (qOperator == '(') {
- qComplement = ')';
- } else if (qOperator == '{') {
- qComplement = '}';
- } else if (qOperator == '[') {
- qComplement = ']';
- } else {
- qComplement = qOperator;
- }
-
- if (sc.Match(qComplement, '\'')) {
- sc.Forward();
- sc.ForwardSetState(SCE_SQL_DEFAULT);
- qOperator = 0x00;
+ // Locate the unique Q operator character
+ sc.Complete();
+ char qOperator = 0x00;
+ for (int styleStartPos = sc.currentPos; styleStartPos > 0; --styleStartPos) {
+ if (styler.StyleAt(styleStartPos - 1) != SCE_SQL_QOPERATOR) {
+ qOperator = styler.SafeGetCharAt(styleStartPos + 2);
+ break;
}
- }
+ }
+
+ char qComplement = 0x00;
+
+ if (qOperator == '<') {
+ qComplement = '>';
+ } else if (qOperator == '(') {
+ qComplement = ')';
+ } else if (qOperator == '{') {
+ qComplement = '}';
+ } else if (qOperator == '[') {
+ qComplement = ']';
+ } else {
+ qComplement = qOperator;
+ }
+
+ if (sc.Match(qComplement, '\'')) {
+ sc.Forward();
+ sc.ForwardSetState(SCE_SQL_DEFAULT);
+ }
break;
}
|