[geany/geany] 4bac37: Update for new Scintilla styles

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Wed, 22 May 2013 01:38:21 UTC
Commit:      4bac3717eaaaa0ab4d915694ec9a47524c42372a
             https://github.com/geany/geany/commit/4bac3717eaaaa0ab4d915694ec9a47524c42372a

Log Message:
-----------
Update for new Scintilla styles


Modified Paths:
--------------
    data/filetypes.c
    data/filetypes.haskell
    src/highlighting.c
    src/highlightingmappings.h

Modified: data/filetypes.c
1 files changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -6,6 +6,7 @@
 commentline=comment_line
 commentdoc=comment_doc
 preprocessorcomment=comment
+preprocessorcommentdoc=comment_doc
 number=number_1
 word=keyword_1
 word2=keyword_2


Modified: data/filetypes.haskell
4 files changed, 4 insertions(+), 0 deletions(-)
===================================================================
@@ -20,6 +20,10 @@ module=function
 data=number_2
 pragma=preprocessor
 preprocessor=preprocessor
+stringeol=string_eol
+reserved_operator=operator
+literate_comment=comment
+literate_codedelim=other
 
 [keywords]
 # all items must be in one line


Modified: src/highlighting.c
5 files changed, 4 insertions(+), 1 deletions(-)
===================================================================
@@ -1510,6 +1510,7 @@ gboolean highlighting_is_string_style(gint lexer, gint style)
 
 		case SCLEX_HASKELL:
 			return (style == SCE_HA_CHARACTER ||
+				style == SCE_HA_STRINGEOL ||
 				style == SCE_HA_STRING);
 
 		case SCLEX_FREEBASIC:
@@ -1592,6 +1593,7 @@ gboolean highlighting_is_comment_style(gint lexer, gint style)
 				style == SCE_C_COMMENTLINE ||
 				style == SCE_C_COMMENTDOC ||
 				style == SCE_C_PREPROCESSORCOMMENT ||
+				style == SCE_C_PREPROCESSORCOMMENTDOC ||
 				style == SCE_C_COMMENTLINEDOC ||
 				style == SCE_C_COMMENTDOCKEYWORD ||
 				style == SCE_C_COMMENTDOCKEYWORDERROR);
@@ -1670,7 +1672,8 @@ gboolean highlighting_is_comment_style(gint lexer, gint style)
 			return (style == SCE_HA_COMMENTLINE ||
 				style == SCE_HA_COMMENTBLOCK ||
 				style == SCE_HA_COMMENTBLOCK2 ||
-				style == SCE_HA_COMMENTBLOCK3);
+				style == SCE_HA_COMMENTBLOCK3 ||
+				style == SCE_HA_LITERATE_COMMENT);
 
 		case SCLEX_FREEBASIC:
 			return (style == SCE_B_COMMENT);


Modified: src/highlightingmappings.h
43 files changed, 24 insertions(+), 19 deletions(-)
===================================================================
@@ -206,6 +206,7 @@
 	{ SCE_C_COMMENTLINE,			"commentline",				FALSE },
 	{ SCE_C_COMMENTDOC,				"commentdoc",				FALSE },
 	{ SCE_C_PREPROCESSORCOMMENT,	"preprocessorcomment",		FALSE },
+	{ SCE_C_PREPROCESSORCOMMENTDOC,	"preprocessorcommentdoc",	FALSE },
 	{ SCE_C_NUMBER,					"number",					FALSE },
 	{ SCE_C_WORD,					"word",						FALSE },
 	{ SCE_C_WORD2,					"word2",					FALSE },
@@ -594,25 +595,29 @@
 #define highlighting_lexer_HASKELL			SCLEX_HASKELL
 static const HLStyle highlighting_styles_HASKELL[] =
 {
-	{ SCE_HA_DEFAULT,		"default",			FALSE },
-	{ SCE_HA_COMMENTLINE,	"commentline",		FALSE },
-	{ SCE_HA_COMMENTBLOCK,	"commentblock",		FALSE },
-	{ SCE_HA_COMMENTBLOCK2,	"commentblock2",	FALSE },
-	{ SCE_HA_COMMENTBLOCK3,	"commentblock3",	FALSE },
-	{ SCE_HA_NUMBER,		"number",			FALSE },
-	{ SCE_HA_KEYWORD,		"keyword",			FALSE },
-	{ SCE_HA_IMPORT,		"import",			FALSE },
-	{ SCE_HA_STRING,		"string",			FALSE },
-	{ SCE_HA_CHARACTER,		"character",		FALSE },
-	{ SCE_HA_CLASS,			"class",			FALSE },
-	{ SCE_HA_OPERATOR,		"operator",			FALSE },
-	{ SCE_HA_IDENTIFIER,	"identifier",		FALSE },
-	{ SCE_HA_INSTANCE,		"instance",			FALSE },
-	{ SCE_HA_CAPITAL,		"capital",			FALSE },
-	{ SCE_HA_MODULE,		"module",			FALSE },
-	{ SCE_HA_DATA,			"data",				FALSE },
-	{ SCE_HA_PRAGMA,		"pragma",			FALSE },
-	{ SCE_HA_PREPROCESSOR,	"preprocessor",		FALSE }
+	{ SCE_HA_DEFAULT,				"default",				FALSE },
+	{ SCE_HA_COMMENTLINE,			"commentline",			FALSE },
+	{ SCE_HA_COMMENTBLOCK,			"commentblock",			FALSE },
+	{ SCE_HA_COMMENTBLOCK2,			"commentblock2",		FALSE },
+	{ SCE_HA_COMMENTBLOCK3,			"commentblock3",		FALSE },
+	{ SCE_HA_NUMBER,				"number",				FALSE },
+	{ SCE_HA_KEYWORD,				"keyword",				FALSE },
+	{ SCE_HA_IMPORT,				"import",				FALSE },
+	{ SCE_HA_STRING,				"string",				FALSE },
+	{ SCE_HA_CHARACTER,				"character",			FALSE },
+	{ SCE_HA_CLASS,					"class",				FALSE },
+	{ SCE_HA_OPERATOR,				"operator",				FALSE },
+	{ SCE_HA_IDENTIFIER,			"identifier",			FALSE },
+	{ SCE_HA_INSTANCE,				"instance",				FALSE },
+	{ SCE_HA_CAPITAL,				"capital",				FALSE },
+	{ SCE_HA_MODULE,				"module",				FALSE },
+	{ SCE_HA_DATA,					"data",					FALSE },
+	{ SCE_HA_PRAGMA,				"pragma",				FALSE },
+	{ SCE_HA_PREPROCESSOR,			"preprocessor",			FALSE },
+	{ SCE_HA_STRINGEOL,				"stringeol",			FALSE },
+	{ SCE_HA_RESERVED_OPERATOR,		"reserved_operator",	FALSE },
+	{ SCE_HA_LITERATE_COMMENT,		"literate_comment",		FALSE },
+	{ SCE_HA_LITERATE_CODEDELIM,	"literate_codedelim",	FALSE }
 };
 static const HLKeyword highlighting_keywords_HASKELL[] =
 {



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).