SF.net SVN: geany:[4291] trunk
ntrel at users.sourceforge.net
ntrel at xxxxx
Sun Oct 4 12:15:29 UTC 2009
Revision: 4291
http://geany.svn.sourceforge.net/geany/?rev=4291&view=rev
Author: ntrel
Date: 2009-10-04 12:15:29 +0000 (Sun, 04 Oct 2009)
Log Message:
-----------
Call apply_filetype_properties() from styleset_c_like().
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/highlighting.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-10-04 11:55:50 UTC (rev 4290)
+++ trunk/ChangeLog 2009-10-04 12:15:29 UTC (rev 4291)
@@ -2,6 +2,8 @@
* src/highlighting.c:
Move new_styleset() and preprocessor setup code into styleset_c_like().
+ * src/highlighting.c:
+ Call apply_filetype_properties() from styleset_c_like().
2009-10-03 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/src/highlighting.c
===================================================================
--- trunk/src/highlighting.c 2009-10-04 11:55:50 UTC (rev 4290)
+++ trunk/src/highlighting.c 2009-10-04 12:15:29 UTC (rev 4291)
@@ -837,7 +837,7 @@
/* preprocess_ifdef: C#, Vala have a reduced preprocessor-like syntax without #ifdef */
-static void styleset_c_like(ScintillaObject *sci, gint filetype_idx,
+static void styleset_c_like(ScintillaObject *sci, gint ft_id,
gboolean preprocessor, gboolean preprocess_ifdef)
{
gint styles[] = {
@@ -864,10 +864,12 @@
SCE_C_GLOBALCLASS
};
- apply_style_entries(sci, filetype_idx, styles, G_N_ELEMENTS(styles));
+ apply_filetype_properties(sci, SCLEX_CPP, ft_id);
+
+ apply_style_entries(sci, ft_id, styles, G_N_ELEMENTS(styles));
if (preprocessor)
{
- if (style_sets[filetype_idx].styling[20].foreground == 1)
+ if (style_sets[ft_id].styling[20].foreground == 1)
sci_set_property(sci, "styling.within.preprocessor", "1");
sci_set_property(sci, "preprocessor.symbol.$(file.patterns.cpp)", "#");
sci_set_property(sci, "preprocessor.start.$(file.patterns.cpp)",
@@ -894,7 +896,7 @@
{
const filetype_id ft_id = GEANY_FILETYPES_C;
- apply_filetype_properties(sci, SCLEX_CPP, ft_id);
+ styleset_c_like(sci, ft_id, TRUE, TRUE);
sci_set_keywords(sci, 0, style_sets[GEANY_FILETYPES_C].keywords[0]);
sci_set_keywords(sci, 2, style_sets[GEANY_FILETYPES_C].keywords[2]);
@@ -902,8 +904,6 @@
/* assign global types, merge them with user defined keywords and set them */
assign_global_and_user_keywords(sci, style_sets[GEANY_FILETYPES_C].keywords[1],
filetypes[ft_id]->lang);
-
- styleset_c_like(sci, GEANY_FILETYPES_C, TRUE, TRUE);
}
@@ -923,7 +923,7 @@
{
const filetype_id ft_id = GEANY_FILETYPES_CPP;
- apply_filetype_properties(sci, SCLEX_CPP, ft_id);
+ styleset_c_like(sci, ft_id, TRUE, TRUE);
sci_set_keywords(sci, 0, style_sets[GEANY_FILETYPES_CPP].keywords[0]);
/* for SCI_SETKEYWORDS = 1, see below*/
@@ -932,8 +932,6 @@
/* assign global types, merge them with user defined keywords and set them */
assign_global_and_user_keywords(sci, style_sets[GEANY_FILETYPES_CPP].keywords[1],
filetypes[ft_id]->lang);
-
- styleset_c_like(sci, GEANY_FILETYPES_CPP, TRUE, TRUE);
}
@@ -953,7 +951,7 @@
{
const filetype_id ft_id = GEANY_FILETYPES_GLSL;
- apply_filetype_properties(sci, SCLEX_CPP, ft_id);
+ styleset_c_like(sci, ft_id, TRUE, TRUE);
sci_set_keywords(sci, 0, style_sets[GEANY_FILETYPES_GLSL].keywords[0]);
/* for SCI_SETKEYWORDS = 1, see below*/
@@ -962,8 +960,6 @@
/* assign global types, merge them with user defined keywords and set them */
assign_global_and_user_keywords(sci, style_sets[GEANY_FILETYPES_GLSL].keywords[1],
filetypes[ft_id]->lang);
-
- styleset_c_like(sci, GEANY_FILETYPES_GLSL, TRUE, TRUE);
}
@@ -983,15 +979,13 @@
{
const filetype_id ft_id = GEANY_FILETYPES_CS;
- apply_filetype_properties(sci, SCLEX_CPP, ft_id);
+ styleset_c_like(sci, ft_id, TRUE, FALSE);
sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]);
sci_set_keywords(sci, 2, style_sets[ft_id].keywords[2]);
/* assign global types, merge them with user defined keywords and set them */
assign_global_and_user_keywords(sci, style_sets[ft_id].keywords[1], filetypes[ft_id]->lang);
-
- styleset_c_like(sci, ft_id, TRUE, FALSE);
}
@@ -1011,15 +1005,13 @@
{
const filetype_id ft_id = GEANY_FILETYPES_VALA;
- apply_filetype_properties(sci, SCLEX_CPP, ft_id);
+ styleset_c_like(sci, ft_id, TRUE, FALSE);
sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]);
sci_set_keywords(sci, 2, style_sets[ft_id].keywords[2]);
/* assign global types, merge them with user defined keywords and set them */
assign_global_and_user_keywords(sci, style_sets[ft_id].keywords[1], filetypes[ft_id]->lang);
-
- styleset_c_like(sci, ft_id, TRUE, FALSE);
}
@@ -1473,7 +1465,7 @@
{
const filetype_id ft_id = GEANY_FILETYPES_JAVA;
- apply_filetype_properties(sci, SCLEX_CPP, ft_id);
+ styleset_c_like(sci, ft_id, FALSE, FALSE);
sci_set_keywords(sci, 0, style_sets[GEANY_FILETYPES_JAVA].keywords[0]);
sci_set_keywords(sci, 1, style_sets[GEANY_FILETYPES_JAVA].keywords[1]);
@@ -1482,8 +1474,6 @@
/* assign global types, merge them with user defined keywords and set them */
assign_global_and_user_keywords(sci, style_sets[ft_id].keywords[1], filetypes[ft_id]->lang);
-
- styleset_c_like(sci, GEANY_FILETYPES_JAVA, FALSE, FALSE);
}
@@ -2792,13 +2782,11 @@
{
const filetype_id ft_id = GEANY_FILETYPES_FERITE;
- apply_filetype_properties(sci, SCLEX_CPP, ft_id);
+ styleset_c_like(sci, ft_id, FALSE, FALSE);
sci_set_keywords(sci, 0, style_sets[GEANY_FILETYPES_FERITE].keywords[0]);
sci_set_keywords(sci, 1, style_sets[GEANY_FILETYPES_FERITE].keywords[1]);
sci_set_keywords(sci, 2, style_sets[GEANY_FILETYPES_FERITE].keywords[2]);
-
- styleset_c_like(sci, GEANY_FILETYPES_FERITE, FALSE, FALSE);
}
@@ -2924,11 +2912,9 @@
{
const filetype_id ft_id = GEANY_FILETYPES_JS;
- apply_filetype_properties(sci, SCLEX_CPP, ft_id);
+ styleset_c_like(sci, ft_id, FALSE, FALSE);
sci_set_keywords(sci, 0, style_sets[GEANY_FILETYPES_JS].keywords[0]);
-
- styleset_c_like(sci, GEANY_FILETYPES_JS, FALSE, FALSE);
}
@@ -3090,13 +3076,13 @@
static void styleset_actionscript(ScintillaObject *sci)
{
- apply_filetype_properties(sci, SCLEX_CPP, GEANY_FILETYPES_AS);
+ const filetype_id ft_id = GEANY_FILETYPES_AS;
+ styleset_c_like(sci, ft_id, FALSE, FALSE);
+
sci_set_keywords(sci, 0, style_sets[GEANY_FILETYPES_AS].keywords[0]);
sci_set_keywords(sci, 1, style_sets[GEANY_FILETYPES_AS].keywords[2]);
sci_set_keywords(sci, 3, style_sets[GEANY_FILETYPES_AS].keywords[1]);
-
- styleset_c_like(sci, GEANY_FILETYPES_AS, FALSE, FALSE);
}
@@ -3116,13 +3102,11 @@
{
const filetype_id ft_id = GEANY_FILETYPES_HAXE;
- apply_filetype_properties(sci, SCLEX_CPP, ft_id);
+ styleset_c_like(sci, ft_id, FALSE, FALSE);
sci_set_keywords(sci, 0, style_sets[GEANY_FILETYPES_HAXE].keywords[0]);
sci_set_keywords(sci, 1, style_sets[GEANY_FILETYPES_HAXE].keywords[1]);
sci_set_keywords(sci, 3, style_sets[GEANY_FILETYPES_HAXE].keywords[2]);
-
- styleset_c_like(sci, GEANY_FILETYPES_HAXE, FALSE, FALSE);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list