diff options
| author | nyamatongwe <devnull@localhost> | 2011-05-21 10:19:14 +1000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2011-05-21 10:19:14 +1000 |
| commit | 0865a5956ebacc1e816366330a4b311065ec068d (patch) | |
| tree | 0bb6da58109e866caee2627d3986f7769d6949b4 /lexers/LexHTML.cxx | |
| parent | 9ed1465a78cc69038d8a5655e6e1dba9c4258e5b (diff) | |
| download | scintilla-mirror-0865a5956ebacc1e816366330a4b311065ec068d.tar.gz | |
Code formatting normalised to standard.
Diffstat (limited to 'lexers/LexHTML.cxx')
| -rw-r--r-- | lexers/LexHTML.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
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 == '-')) { |