aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorkudah <kudahkukarek@gmail.com>2013-05-09 23:10:04 +0300
committerkudah <kudahkukarek@gmail.com>2013-05-09 23:10:04 +0300
commitdf2708a7fcb804156a482546bfcc8ae887c49359 (patch)
treebeaca306e3e61f06a23e46105417c62e3ec12668 /include
parentfc45916ab1b338983808e904d6316ffcc9d1be50 (diff)
downloadscintilla-mirror-df2708a7fcb804156a482546bfcc8ae887c49359.tar.gz
* Literate Haskell support
* CPP highlighting is disableable * CPP is now correctly colored when inside comments and strings * Some bugs with incremental lexing fixed * Indented imports folding is now undisableable
Diffstat (limited to 'include')
-rw-r--r--include/SciLexer.h3
-rw-r--r--include/Scintilla.iface3
2 files changed, 6 insertions, 0 deletions
diff --git a/include/SciLexer.h b/include/SciLexer.h
index 506848a1c..1ddf628bd 100644
--- a/include/SciLexer.h
+++ b/include/SciLexer.h
@@ -120,6 +120,7 @@
#define SCLEX_ECL 105
#define SCLEX_OSCRIPT 106
#define SCLEX_VISUALPROLOG 107
+#define SCLEX_LITERATEHASKELL 108
#define SCLEX_AUTOMATIC 1000
#define SCE_P_DEFAULT 0
#define SCE_P_COMMENTLINE 1
@@ -1025,6 +1026,8 @@
#define SCE_HA_PREPROCESSOR 18
#define SCE_HA_STRINGEOL 19
#define SCE_HA_RESERVED_OPERATOR 20
+#define SCE_HA_LITERATE_COMMENT 21
+#define SCE_HA_LITERATE_CODEDELIM 22
#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 a4c8c29f6..d15050e1d 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -2578,6 +2578,7 @@ val SCLEX_AVS=104
val SCLEX_ECL=105
val SCLEX_OSCRIPT=106
val SCLEX_VISUALPROLOG=107
+val SCLEX_LITERATEHASKELL=108
# When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
# value assigned in sequence from SCLEX_AUTOMATIC+1.
@@ -3615,6 +3616,8 @@ val SCE_HA_PRAGMA=17
val SCE_HA_PREPROCESSOR=18
val SCE_HA_STRINGEOL=19
val SCE_HA_RESERVED_OPERATOR=20
+val SCE_HA_LITERATE_COMMENT=21
+val SCE_HA_LITERATE_CODEDELIM=22
# Lexical states of SCLEX_TADS3
lex TADS3=SCLEX_TADS3 SCE_T3_
val SCE_T3_DEFAULT=0