[geany/geany] 9a41f9: Update mappings for new Scintilla

Colomban Wendling git-noreply at xxxxx
Mon Apr 14 14:36:05 UTC 2014


Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Mon, 14 Apr 2014 14:36:05 UTC
Commit:      9a41f919c17ab0fffd11e4979a75ec562e01d4d2
             https://github.com/geany/geany/commit/9a41f919c17ab0fffd11e4979a75ec562e01d4d2

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


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

Modified: data/filetypes.c
1 files changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -13,6 +13,7 @@ word2=keyword_2
 string=string_1
 stringraw=string_2
 character=character
+userliteral=other
 uuid=other
 preprocessor=preprocessor
 operator=operator


Modified: data/filetypes.freebasic
6 files changed, 5 insertions(+), 1 deletions(-)
===================================================================
@@ -2,7 +2,11 @@
 [styling]
 # Edit these in the colorscheme .conf file instead
 default=default
-comment=comment
+comment=comment_line
+commentblock=comment
+docline=comment_line_doc
+docblock=comment_doc
+dockeyword=comment_doc_keyword
 number=number_1
 word=keyword_1
 string=string_1


Modified: src/highlighting.c
6 files changed, 5 insertions(+), 1 deletions(-)
===================================================================
@@ -1658,7 +1658,11 @@ gboolean highlighting_is_comment_style(gint lexer, gint style)
 				style == SCE_HA_LITERATE_CODEDELIM);
 
 		case SCLEX_FREEBASIC:
-			return (style == SCE_B_COMMENT);
+			return (style == SCE_B_COMMENT ||
+				style == SCE_B_COMMENTBLOCK ||
+				style == SCE_B_DOCLINE ||
+				style == SCE_B_DOCBLOCK ||
+				style == SCE_B_DOCKEYWORD);
 
 		case SCLEX_YAML:
 			return (style == SCE_YAML_COMMENT);


Modified: src/highlightingmappings.h
5 files changed, 5 insertions(+), 0 deletions(-)
===================================================================
@@ -168,6 +168,10 @@ static const HLStyle highlighting_styles_BASIC[] =
 {
 	{ SCE_B_DEFAULT,		"default",			FALSE },
 	{ SCE_B_COMMENT,		"comment",			FALSE },
+	{ SCE_B_COMMENTBLOCK,	"commentblock",		FALSE },
+	{ SCE_B_DOCLINE,		"docline",			FALSE },
+	{ SCE_B_DOCBLOCK,		"docblock",			FALSE },
+	{ SCE_B_DOCKEYWORD,		"dockeyword",		FALSE },
 	{ SCE_B_NUMBER,			"number",			FALSE },
 	{ SCE_B_KEYWORD,		"word",				FALSE },
 	{ SCE_B_STRING,			"string",			FALSE },
@@ -234,6 +238,7 @@ static const HLStyle highlighting_styles_C[] =
 	{ SCE_C_STRING,					"string",					FALSE },
 	{ SCE_C_STRINGRAW,				"stringraw",				FALSE },
 	{ SCE_C_CHARACTER,				"character",				FALSE },
+	{ SCE_C_USERLITERAL,			"userliteral",				FALSE },
 	{ SCE_C_UUID,					"uuid",						FALSE },
 	{ SCE_C_PREPROCESSOR,			"preprocessor",				FALSE },
 	{ SCE_C_OPERATOR,				"operator",					FALSE },



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


More information about the Commits mailing list