From df2708a7fcb804156a482546bfcc8ae887c49359 Mon Sep 17 00:00:00 2001 From: kudah Date: Thu, 9 May 2013 23:10:04 +0300 Subject: * 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 --- include/SciLexer.h | 3 +++ include/Scintilla.iface | 3 +++ 2 files changed, 6 insertions(+) (limited to 'include') 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 -- cgit v1.2.3