diff options
| author | Kein-Hong Man <devnull@localhost> | 2015-12-11 13:05:50 +1100 |
|---|---|---|
| committer | Kein-Hong Man <devnull@localhost> | 2015-12-11 13:05:50 +1100 |
| commit | fdc46e5d4307ef7481cffbe4f7aa895218e14227 (patch) | |
| tree | 8daa4b13a23ea701822aa961444fd3d4f9e399e1 | |
| parent | 6f015a5a9dcc8b0c3a950efac1e972391d519c0f (diff) | |
| download | scintilla-mirror-fdc46e5d4307ef7481cffbe4f7aa895218e14227.tar.gz | |
Bug [#1790]. Include '&' and '|' bitwise operators for Lua 5.3.
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | lexers/LexLua.cxx | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 955c79674..03d41a19a 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -508,6 +508,10 @@ <a href="http://sourceforge.net/p/scintilla/bugs/1789/">Bug #1789</a>. </li> <li> + Lua lexer includes '&' and '|' bitwise operators for Lua 5.3. + <a href="http://sourceforge.net/p/scintilla/bugs/1790/">Bug #1790</a>. + </li> + <li> Send SCN_UPDATEUI with SC_UPDATE_SELECTION when the application changes multiple selection. </li> diff --git a/lexers/LexLua.cxx b/lexers/LexLua.cxx index b62e69a35..1e115ad18 100644 --- a/lexers/LexLua.cxx +++ b/lexers/LexLua.cxx @@ -64,7 +64,7 @@ static void ColouriseLuaDoc( // but probably enough in most cases. [pP] is for hex floats. CharacterSet setNumber(CharacterSet::setDigits, ".-+abcdefpABCDEFP"); CharacterSet setExponent(CharacterSet::setNone, "eEpP"); - CharacterSet setLuaOperator(CharacterSet::setNone, "*/-+()={}~[];<>,.^%:#"); + CharacterSet setLuaOperator(CharacterSet::setNone, "*/-+()={}~[];<>,.^%:#&|"); CharacterSet setEscapeSkip(CharacterSet::setNone, "\"'\\"); Sci_Position currentLine = styler.GetLine(startPos); |