diff options
author | XhmikosR <xhmikosr@gmail.com> | 2016-01-26 21:30:28 +0200 |
---|---|---|
committer | XhmikosR <xhmikosr@gmail.com> | 2016-01-26 21:30:28 +0200 |
commit | b46520698a0913e1d97148398b0b99ea0491ef6d (patch) | |
tree | 4ddaf35c990c567751f2734b433c2cba443ce28f /scintilla/lexers/LexMySQL.cxx | |
parent | c8b14b4821a3197d26b6bd2d65b0fca490bc1d09 (diff) | |
download | notepad2-mod-b46520698a0913e1d97148398b0b99ea0491ef6d.zip notepad2-mod-b46520698a0913e1d97148398b0b99ea0491ef6d.tar.gz notepad2-mod-b46520698a0913e1d97148398b0b99ea0491ef6d.tar.bz2 |
Update Scintilla to v3.6.3 HG (25eaad4).4.2.25.970
Diffstat (limited to 'scintilla/lexers/LexMySQL.cxx')
-rw-r--r-- | scintilla/lexers/LexMySQL.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scintilla/lexers/LexMySQL.cxx b/scintilla/lexers/LexMySQL.cxx index 4cd89e5..15afcdc 100644 --- a/scintilla/lexers/LexMySQL.cxx +++ b/scintilla/lexers/LexMySQL.cxx @@ -362,7 +362,7 @@ static void FoldMySQLDoc(Sci_PositionU startPos, Sci_Position length, int initSt int styleNext = styler.StyleAt(startPos);
int style = initStyle;
int activeState = (style == SCE_MYSQL_HIDDENCOMMAND) ? HIDDENCOMMAND_STATE : style & HIDDENCOMMAND_STATE;
-
+
bool endPending = false;
bool whenPending = false;
bool elseIfPending = false;
@@ -375,11 +375,11 @@ static void FoldMySQLDoc(Sci_PositionU startPos, Sci_Position length, int initSt style = styleNext;
styleNext = styler.StyleAt(i + 1);
activeState = (style == SCE_MYSQL_HIDDENCOMMAND) ? HIDDENCOMMAND_STATE : style & HIDDENCOMMAND_STATE;
-
+
char currentChar = nextChar;
nextChar = styler.SafeGetCharAt(i + 1);
bool atEOL = (currentChar == '\r' && nextChar != '\n') || (currentChar == '\n');
-
+
switch (MASKACTIVE(style))
{
case SCE_MYSQL_COMMENT:
@@ -392,7 +392,7 @@ static void FoldMySQLDoc(Sci_PositionU startPos, Sci_Position length, int initSt break;
case SCE_MYSQL_COMMENTLINE:
if (foldComment)
- {
+ {
// Not really a standard, but we add support for single line comments
// with special curly braces syntax as foldable comments too.
// MySQL needs -- comments to be followed by space or control char
@@ -500,12 +500,12 @@ static void FoldMySQLDoc(Sci_PositionU startPos, Sci_Position length, int initSt }
}
}
-
+
// Keep the current end state for the next round.
endPending = endFound;
}
break;
-
+
default:
if (!isspacechar(currentChar) && endPending)
{
@@ -547,7 +547,7 @@ static void FoldMySQLDoc(Sci_PositionU startPos, Sci_Position length, int initSt lev |= SC_FOLDLEVELHEADERFLAG;
if (lev != styler.LevelAt(lineCurrent))
styler.SetLevel(lineCurrent, lev);
-
+
lineCurrent++;
levelCurrent = levelNext;
visibleChars = 0;
|