Permalink
Browse files

Update for new Scintilla styles

  • Loading branch information...
1 parent f1dbdab commit 298ce94c5ddc352a19a89dddcadc23bd3aed631b @b4n b4n committed Jun 26, 2012
Showing with 6 additions and 1 deletion.
  1. +1 −0 data/filetypes.c
  2. +1 −0 data/filetypes.css
  3. +2 −1 src/highlighting.c
  4. +2 −0 src/highlightingmappings.h
View
@@ -23,6 +23,7 @@ commentdockeyworderror=comment_doc_keyword_error
globalclass=class
# """verbatim"""
tripleverbatim=string_2
+hashquotedstring=string_2
[keywords]
# all items must be in one line
View
@@ -16,6 +16,7 @@ attribute=attribute
value=value
id=number
identifier2=keyword_2
+variable=identifier_1
important=extra
directive=preprocessor
identifier3=keyword_3
View
@@ -1402,7 +1402,8 @@ gboolean highlighting_is_string_style(gint lexer, gint style)
style == SCE_C_STRINGEOL ||
style == SCE_C_STRINGRAW ||
style == SCE_C_VERBATIM ||
- style == SCE_C_TRIPLEVERBATIM);
+ style == SCE_C_TRIPLEVERBATIM ||
+ style == SCE_C_HASHQUOTEDSTRING);
case SCLEX_PASCAL:
return (style == SCE_PAS_CHARACTER ||
@@ -194,6 +194,7 @@ static const HLStyle highlighting_styles_C[] =
/* triple verbatims use the same style */
{ SCE_C_TRIPLEVERBATIM, "verbatim", FALSE },
{ SCE_C_REGEX, "regex", FALSE },
+ { SCE_C_HASHQUOTEDSTRING, "hashquotedstring", FALSE },
{ SCE_C_COMMENTLINEDOC, "commentlinedoc", FALSE },
{ SCE_C_COMMENTDOCKEYWORD, "commentdockeyword", FALSE },
{ SCE_C_COMMENTDOCKEYWORDERROR, "commentdockeyworderror", FALSE },
@@ -291,6 +292,7 @@ static const HLStyle highlighting_styles_CSS[] =
{ SCE_CSS_VALUE, "value", FALSE },
{ SCE_CSS_ID, "id", FALSE },
{ SCE_CSS_IDENTIFIER2, "identifier2", FALSE },
+ { SCE_CSS_VARIABLE, "variable", FALSE },
{ SCE_CSS_IMPORTANT, "important", FALSE },
{ SCE_CSS_DIRECTIVE, "directive", FALSE },
{ SCE_CSS_IDENTIFIER3, "identifier3", FALSE },

0 comments on commit 298ce94

Please sign in to comment.