aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorkudah <kudahkukarek@gmail.com>2013-04-04 11:16:34 +0300
committerkudah <kudahkukarek@gmail.com>2013-04-04 11:16:34 +0300
commita68c080093f8f070d3a605d22049f4ffbc5c6f87 (patch)
tree831470db14ca38288e97e4ba7eb475b4d62bc563 /include
parent98ca2e61c0717085ea47a986e8fdd505f297b1cf (diff)
downloadscintilla-mirror-a68c080093f8f070d3a605d22049f4ffbc5c6f87.tar.gz
Improvements to Haskell Lexer:
* Added support for MagicHash extension (lexer.haskell.allow.hash) * $ and # are now colored as operators. * .0 and -0 are now properly colored as operator and a number, not as just number. * Operators starting with double dash (e.g ---->) are properly colored as operators, not comments. * Added pragma highlighting. * Added basic C-preprocessor highlighting. * Qualified names (e.g. ABC.xyz) are now properly highlighted as identifiers, not types. * Qualified operators (e.g. ABC.<$>) are now properly highlighted as operators. * Operator . is now properly highlighted as an operator, not part of the identifier, when applied to a qualified and an unqualified value (e.g. Abc.xyz.yzx <- last one is an operator) * Operators starting with ':' are now properly highlighted as type constructors, not operators. * family after data is highlighted, as per TypeFamilies.
Diffstat (limited to 'include')
-rw-r--r--include/SciLexer.h2
-rw-r--r--include/Scintilla.iface2
2 files changed, 4 insertions, 0 deletions
diff --git a/include/SciLexer.h b/include/SciLexer.h
index 44043fe6e..f04222d19 100644
--- a/include/SciLexer.h
+++ b/include/SciLexer.h
@@ -1020,6 +1020,8 @@
#define SCE_HA_COMMENTBLOCK 14
#define SCE_HA_COMMENTBLOCK2 15
#define SCE_HA_COMMENTBLOCK3 16
+#define SCE_HA_PRAGMA 17
+#define SCE_HA_PREPROCESSOR 18
#define SCE_T3_DEFAULT 0
#define SCE_T3_X_DEFAULT 1
#define SCE_T3_PREPROCESSOR 2
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index 8d15e1c4c..c1d6da9e3 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -3581,6 +3581,8 @@ val SCE_HA_COMMENTLINE=13
val SCE_HA_COMMENTBLOCK=14
val SCE_HA_COMMENTBLOCK2=15
val SCE_HA_COMMENTBLOCK3=16
+val SCE_HA_PRAGMA=17
+val SCE_HA_PREPROCESSOR=18
# Lexical states of SCLEX_TADS3
lex TADS3=SCLEX_TADS3 SCE_T3_
val SCE_T3_DEFAULT=0