vtorri
/
edi
forked from enlightenment/edi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tweaking syntax a little to have 1) less vivid comments and 2) the same colour for macro introducing punctuation characters as the macro they introduce

This commit is contained in:
Andy Williams 2014-10-12 13:34:41 +01:00
parent f7639a9631
commit ae9990f06c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/bin/editor/edi_editor.c
View File

@ -23,7 +23,7 @@
#define Edi_Color const char *
static Edi_Color EDI_COLOR_FOREGROUND = "+ color=#ffffff";
static Edi_Color EDI_COLOR_COMMENT = "+ color=#00B000";
static Edi_Color EDI_COLOR_COMMENT = "+ color=#3399ff";
static Edi_Color EDI_COLOR_STRING = "+ color=#ff3a35";
static Edi_Color EDI_COLOR_NUMBER = "+ color=#D4D42A font_weight=Bold";
static Edi_Color EDI_COLOR_BRACE = "+ color=#656565";
@ -32,7 +32,7 @@ static Edi_Color EDI_COLOR_CLASS = "+ color=#72AAD4 font_weight=Bold";
static Edi_Color EDI_COLOR_FUNCTION = "+ color=#72AAD4 font_weight=Bold";
static Edi_Color EDI_COLOR_PARAM = "+ color=#ffffff";
static Edi_Color EDI_COLOR_KEYWORD = "+ color=#ff9900 font_weight=Bold";
static Edi_Color EDI_COLOR_PREPROCESSOR = "+ color=#3399ff font_weight=Bold";
static Edi_Color EDI_COLOR_PREPROCESSOR = "+ color=#00B000 font_weight=Bold";
static Edi_Color EDI_COLOR_BACKGROUND = "+ backing_color=#000000";
static Edi_Color EDI_COLOR_SEVIRITY_IGNORED = "+ backing_color=#000000";
@ -342,7 +342,12 @@ _clang_load_highlighting(const char *path, Edi_Editor *editor)
switch (clang_getTokenKind(tokens[i]))
{
case CXToken_Punctuation:
color = EDI_COLOR_BRACE;
if (i < n - 1 &&
(clang_getTokenKind(tokens[i + 1]) == CXToken_Identifier && (cursors[i + 1].kind == CXCursor_MacroDefinition ||
cursors[i + 1].kind == CXCursor_InclusionDirective || cursors[i + 1].kind == CXCursor_PreprocessingDirective)))
color = EDI_COLOR_PREPROCESSOR;
else
color = EDI_COLOR_BRACE;
break;
case CXToken_Identifier:
if (cursors[i].kind < CXCursor_FirstRef)