From d83caa64811201bd9c24c66c7b7da90ecf65489a Mon Sep 17 00:00:00 2001 From: Nick Treleaven Date: Wed, 30 Sep 2009 12:10:24 +0000 Subject: [PATCH] Add Vala keywords to conf file. git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4270 ea778897-0a13-0410-b9d1-a72fbfd435f5 --- ChangeLog | 6 ++++++ data/filetypes.vala | 4 ++-- src/highlighting.c | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f5a99f5..98595a5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-09-30 Nick Treleaven + + * src/highlighting.c, data/filetypes.vala: + Add Vala keywords to conf file. + + 2009-09-29 Nick Treleaven * src/symbols.c, tagmanager/perl.c: diff --git a/data/filetypes.vala b/data/filetypes.vala index 97f8a9c7..5900ff3e 100644 --- a/data/filetypes.vala +++ b/data/filetypes.vala @@ -26,10 +26,10 @@ globalclass=type [keywords] # all items must be in one line -#primary= +primary=else if switch case default break continue return for foreach in do while is try catch finally throw namespace interface class struct enum signal errordomain construct callback get set base const static var weak virtual abstract override inline extern public protected private delegate out ref lock using true false null generic new delete base this value typeof sizeof throws requires ensures void bool char uchar int uint short ushort long ulong size_t ssize_t int8 uint8 int16 uint16 int32 uint32 int64 uint64 float double unichar string constpointer time_t #secondary= # these are some doxygen keywords (incomplete) -#docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union +docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union [settings] # default extension used when saving files diff --git a/src/highlighting.c b/src/highlighting.c index dae446fd..80468e04 100644 --- a/src/highlighting.c +++ b/src/highlighting.c @@ -1329,6 +1329,7 @@ static void styleset_markup(ScintillaObject *sci, gboolean set_keywords) keywords = (set_keywords) ? style_sets[GEANY_FILETYPES_XML].keywords[i] : ""; sci_set_keywords(sci, i, keywords); } + /* always set SGML keywords */ sci_set_keywords(sci, 5, style_sets[GEANY_FILETYPES_XML].keywords[5]); set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_XML, 0);