[geany/geany] 74ef1b: 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:        Sun, 10 Aug 2014 00:21:54 UTC
Commit:      74ef1b8344a34810771f69ef7b82a8aeca57e894
             https://github.com/geany/geany/commit/74ef1b8344a34810771f69ef7b82a8aeca57e894

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


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

Modified: data/filetypes.rust
3 lines changed, 3 insertions(+), 0 deletions(-)
===================================================================
@@ -14,6 +14,9 @@ word4=type
 string=string_1
 stringraw=string_2
 character=character
+bytestring=string_1
+bytestringraw=string_2
+bytecharacter=character
 operator=operator
 identifier=identifier_1
 lifetime=parameter


Modified: src/highlighting.c
3 lines changed, 3 insertions(+), 0 deletions(-)
===================================================================
@@ -1550,8 +1550,11 @@ gboolean highlighting_is_string_style(gint lexer, gint style)
 
 		case SCLEX_RUST:
 			return (style == SCE_RUST_CHARACTER ||
+				style == SCE_RUST_BYTECHARACTER ||
 				style == SCE_RUST_STRING ||
 				style == SCE_RUST_STRINGR ||
+				style == SCE_RUST_BYTESTRING ||
+				style == SCE_RUST_BYTESTRINGR ||
 				style == SCE_RUST_LEXERROR);
 	}
 	return FALSE;


Modified: src/highlightingmappings.h
5 lines changed, 4 insertions(+), 1 deletions(-)
===================================================================
@@ -1326,7 +1326,10 @@ static const HLStyle highlighting_styles_RUST[] =
 	{ SCE_RUST_IDENTIFIER,			"identifier",				FALSE },
 	{ SCE_RUST_LIFETIME,			"lifetime",					FALSE },
 	{ SCE_RUST_MACRO,				"macro",					FALSE },
-	{ SCE_RUST_LEXERROR,			"lexerror",					FALSE }
+	{ SCE_RUST_LEXERROR,			"lexerror",					FALSE },
+	{ SCE_RUST_BYTESTRING,			"bytestring",				FALSE },
+	{ SCE_RUST_BYTESTRINGR,			"bytestringr",				FALSE },
+	{ SCE_RUST_BYTECHARACTER,		"bytecharacter",			FALSE }
 };
 static const HLKeyword highlighting_keywords_RUST[] =
 {



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