diff options
Diffstat (limited to 'lexers')
| -rw-r--r-- | lexers/LexCPP.cxx | 6 | ||||
| -rw-r--r-- | lexers/LexHTML.cxx | 11 |
2 files changed, 8 insertions, 9 deletions
diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx index 65525a679..22477c32f 100644 --- a/lexers/LexCPP.cxx +++ b/lexers/LexCPP.cxx @@ -435,7 +435,7 @@ int SCI_METHOD LexerCPP::WordListSet(int n, const char *wl) { struct After { int line; After(int line_) : line(line_) {} - bool operator() (PPDefinition &p) const { + bool operator()(PPDefinition &p) const { return p.line > line; } }; @@ -741,7 +741,7 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle, } break; case SCE_C_TRIPLEVERBATIM: - if (sc.Match ("\"\"\"")) { + if (sc.Match("\"\"\"")) { while (sc.Match('"')) { sc.Forward(); } @@ -805,7 +805,7 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle, if (sc.chPrev == 'R') { sc.SetState(SCE_C_STRINGRAW|activitySet); rawStringTerminator = ")"; - for (int termPos = sc.currentPos + 1;;termPos++) { + for (int termPos = sc.currentPos + 1;; termPos++) { char chTerminator = styler.SafeGetCharAt(termPos, '('); if (chTerminator == '(') break; diff --git a/lexers/LexHTML.cxx b/lexers/LexHTML.cxx index c570cd528..4c50a15a1 100644 --- a/lexers/LexHTML.cxx +++ b/lexers/LexHTML.cxx @@ -754,8 +754,8 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty } else if (styler.Match(j, "end")) { levelCurrent--; } - } else if ((ch == '{') || (ch == '}') || (foldComment && (ch == '/') && (chNext == '*')) ) { - levelCurrent += (((ch == '{') || (ch == '/') ) ? 1 : -1); + } else if ((ch == '{') || (ch == '}') || (foldComment && (ch == '/') && (chNext == '*'))) { + levelCurrent += (((ch == '{') || (ch == '/')) ? 1 : -1); } } else if (((state == SCE_HPHP_COMMENT) || (state == SCE_HJ_COMMENT)) && foldComment && (ch == '*') && (chNext == '/')) { levelCurrent--; @@ -882,7 +882,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty (state != SCE_HPHP_COMMENTLINE) && (ch == '<') && (chNext == '?') && - !IsScriptCommentState(state) ) { + !IsScriptCommentState(state)) { beforeLanguage = scriptLanguage; scriptLanguage = segIsScriptingIndicator(styler, i + 2, i + 6, eScriptPHP); if (scriptLanguage != eScriptPHP && isStringState(state)) continue; @@ -971,8 +971,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty styler.ColourTo(i, SCE_H_ASP); ch = static_cast<unsigned char>(styler.SafeGetCharAt(i)); continue; - } - else if (isDjango && state == SCE_H_COMMENT && (ch == '#' && chNext == '}')) { + } else if (isDjango && state == SCE_H_COMMENT && (ch == '#' && chNext == '}')) { styler.ColourTo(i - 1, StateToPrint); i += 1; visibleChars += 1; @@ -1056,7 +1055,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty (ch == '!') && (StateToPrint != SCE_H_CDATA) && (!IsCommentState(StateToPrint)) && - (!IsScriptCommentState(StateToPrint)) ) { + (!IsScriptCommentState(StateToPrint))) { beforePreProc = state; styler.ColourTo(i - 2, StateToPrint); if ((chNext == '-') && (chNext2 == '-')) { |