diff options
| -rw-r--r-- | include/SciLexer.h | 1 | ||||
| -rw-r--r-- | include/Scintilla.iface | 1 | ||||
| -rw-r--r-- | src/LexHTML.cxx | 19 |
3 files changed, 20 insertions, 1 deletions
diff --git a/include/SciLexer.h b/include/SciLexer.h index 6a1dbc697..11533b552 100644 --- a/include/SciLexer.h +++ b/include/SciLexer.h @@ -81,6 +81,7 @@ #define SCLEX_BLITZBASIC 66 #define SCLEX_PUREBASIC 67 #define SCLEX_HASKELL 68 +#define SCLEX_PHPSCRIPT 69 #define SCLEX_AUTOMATIC 1000 #define SCE_P_DEFAULT 0 #define SCE_P_COMMENTLINE 1 diff --git a/include/Scintilla.iface b/include/Scintilla.iface index 417591966..349a3c002 100644 --- a/include/Scintilla.iface +++ b/include/Scintilla.iface @@ -1780,6 +1780,7 @@ val SCLEX_CAML=65 val SCLEX_BLITZBASIC=66 val SCLEX_PUREBASIC=67 val SCLEX_HASKELL=68 +val SCLEX_PHPSCRIPT=69 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a # value assigned in sequence from SCLEX_AUTOMATIC+1. diff --git a/src/LexHTML.cxx b/src/LexHTML.cxx index a579098f2..5c06276ad 100644 --- a/src/LexHTML.cxx +++ b/src/LexHTML.cxx @@ -620,7 +620,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty if (state == SCE_HJ_COMMENTLINE) { char tag[7]; // room for the <script> tag char chr; // current char - int j=0; + int j=0; chr = styler.SafeGetCharAt(i+2); while (j < 6 && !isspacechar(chr)) { tag[j++] = static_cast<char>(MakeLowerCase(chr)); @@ -1962,6 +1962,12 @@ static void ColourisePHPDoc(unsigned int startPos, int length, int initStyle, Wo sc.Complete(); } +static void ColourisePHPScriptDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], + Accessor &styler) { + if(startPos == 0) initStyle = SCE_HPHP_DEFAULT; + ColouriseHyperTextDoc(startPos,length,initStyle,keywordlists,styler); +} + static const char * const htmlWordListDesc[] = { "HTML elements and attributes", "JavaScript keywords", @@ -1972,8 +1978,19 @@ static const char * const htmlWordListDesc[] = { 0, }; +static const char * const phpscriptWordListDesc[] = { + "", //Unused + "", //Unused + "", //Unused + "", //Unused + "PHP keywords", + "", //Unused + 0, +}; + LexerModule lmHTML(SCLEX_HTML, ColouriseHyperTextDoc, "hypertext", 0, htmlWordListDesc); LexerModule lmXML(SCLEX_XML, ColouriseHyperTextDoc, "xml", 0, htmlWordListDesc); // SCLEX_ASP and SCLEX_PHP should not be used in new code: use SCLEX_HTML instead. LexerModule lmASP(SCLEX_ASP, ColouriseASPDoc, "asp", 0, htmlWordListDesc); LexerModule lmPHP(SCLEX_PHP, ColourisePHPDoc, "php", 0, htmlWordListDesc); +LexerModule lmPHPSCRIPT(SCLEX_PHPSCRIPT, ColourisePHPScriptDoc, "phpscript", 0, phpscriptWordListDesc); |