SF.net SVN: geany:[5526] trunk

[eht16 at users.sourceforge.net]

Revision: 5526
          http://geany.svn.sourceforge.net/geany/?rev=5526&view=rev
Author:   eht16
Date:     2011-01-18 19:29:15 +0000 (Tue, 18 Jan 2011)

Log Message:
-----------
Add and use secondary keywords for filetype JavaScript, update and sanitize JavaScript keyword lists (patch by Jason Oster, thank you).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/data/filetypes.javascript
    trunk/src/highlighting.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-01-11 21:49:43 UTC (rev 5525)
+++ trunk/ChangeLog	2011-01-18 19:29:15 UTC (rev 5526)
@@ -1,3 +1,12 @@
+2011-01-18  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/highlighting.c, data/filetypes.javascript:
+   Add and use secondary keywords for filetype JavaScript,
+   update and sanitize JavaScript keyword lists
+   (patch by Jason Oster, thank you).
+
+
+
 2011-01-11  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>
 
  * THANKS, src/about.c:

Modified: trunk/data/filetypes.javascript
===================================================================
--- trunk/data/filetypes.javascript	2011-01-11 21:49:43 UTC (rev 5525)
+++ trunk/data/filetypes.javascript	2011-01-18 19:29:15 UTC (rev 5526)
@@ -26,8 +26,8 @@
 
 [keywords]
 # all items must be in one line
-primary=break case catch const continue delete else eval false finally for function if in try instanceof isFinite isNaN NaN new null return switch this throw true typeof undefined var while with default let
-secondary=Object Function Array prototype
+primary=break case catch const continue default delete do each else false finally for function get if in Infinity instanceof let NaN new null return set switch this throw true try typeof undefined var void while with yield
+secondary=Array Boolean Date Function Math Number Object String RegExp EvalError Error RangeError ReferenceError SyntaxError TypeError URIError prototype decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt
 
 [settings]
 # default extension used when saving files

Modified: trunk/src/highlighting.c
===================================================================
--- trunk/src/highlighting.c	2011-01-11 21:49:43 UTC (rev 5525)
+++ trunk/src/highlighting.c	2011-01-18 19:29:15 UTC (rev 5526)
@@ -3073,9 +3073,10 @@
 {
 	styleset_c_like_init(config, config_home, ft_id);
 
-	style_sets[ft_id].keywords = g_new(gchar*, 2);
+	style_sets[ft_id].keywords = g_new(gchar*, 3);
 	get_keyfile_keywords(config, config_home, "primary", ft_id, 0);
-	style_sets[ft_id].keywords[1] = NULL;
+	get_keyfile_keywords(config, config_home, "secondary", ft_id, 1);
+	style_sets[ft_id].keywords[2] = NULL;
 }
 
 
@@ -3084,6 +3085,7 @@
 	styleset_c_like(sci, ft_id);
 
 	sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]);
+	sci_set_keywords(sci, 1, style_sets[ft_id].keywords[1]);
 }
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.