HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added new style for doc keyword error and added some doc key words for Doxygen and Javadoc.

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@1043 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2006-12-03 22:11:42 +00:00
parent 12868db176
commit 4469c37c42
7 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2006-12-03 Enrico Tröger <enrico.troeger@uvena.de>
* data/filetypes.c, data/filetypes.cpp, data/filetypes.d,
data/filetypes.ferite, data/filetypes.java, src/highlighting.c:
Added new style for doc keyword error and added some doc key words
for Doxygen and Javadoc.
2006-12-02 Enrico Tröger <enrico.troeger@uvena.de>
* src/highlighting.c: Use the same style for unknown doc keywords

4
data/filetypes.c
View File

@ -19,6 +19,7 @@ verbatim=0x101030;0xffffff;false;false
regex=0x105090;0xffffff;false;false
commentlinedoc=0x3f5fbf;0xffffff;true;false
commentdockeyword=0x3f5fbf;0xffffff;true;true
commentdockeyworderror=0x3f5fbf;0xffffff;false;false
globalclass=0x0000d0;0xffffff;true;false
# whether arguments of preprocessor commands should be styled (only first argument is used)
# 1 to enable, 0 to disable
@ -27,7 +28,8 @@ styling_within_preprocessor=1;0;false;false
[keywords]
# all items must be in one line
primary=volatile default export goto sizeof typename asm enum bool union NULL FALSE TRUE typedef struct char int float double void unsigned signed long short extern static register auto const if else switch for while do break continue return class new delete inline case
docComment=TODO FIXME
# 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
[settings]
# the following characters are these which a "word" can contains, see documentation

4
data/filetypes.cpp
View File

@ -19,6 +19,7 @@ verbatim=0x101030;0xffffff;false;false
regex=0x105090;0xffffff;false;false
commentlinedoc=0x3f5fbf;0xffffff;true;false
commentdockeyword=0x3f5fbf;0xffffff;true;true
commentdockeyworderror=0x3f5fbf;0xffffff;false;false
globalclass=0x0000d0;0xffffff;true;false
# whether arguments of preprocessor commands should be styled (only first argument is used)
# 1 to enable, 0 to disable
@ -27,7 +28,8 @@ styling_within_preprocessor=1;0;false;false
[keywords]
# all items must be in one line
primary=and and_eq asm auto bitand bitor bool break case catch char class compl const const_cast continue default delete do double dynamic_cast else enum explicit export extern false float for friend goto if inline int long mutable namespace new not not_eq operator or or_eq private protected public register reinterpret_cast return short signed sizeof static static_cast struct switch template this throw true try typedef typeid typename union unsigned using virtual void volatile wchar_t while xor xor_eq
docComment=TODO FIXME
# 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
[settings]
# the following characters are these which a "word" can contains, see documentation

4
data/filetypes.d
View File

@ -19,6 +19,7 @@ verbatim=0x301010;0xffffff;false;false
regex=0x105090;0xffffff;false;false
commentlinedoc=0x3f5fbf;0xffffff;true;false
commentdockeyword=0x3f5fbf;0xffffff;true;true
commentdockeyworderror=0x3f5fbf;0xffffff;false;true
globalclass=0x0000d0;0xffffff;true;false
# whether arguments of preprocessor commands should be styled (only first argument is used)
# 1 to enable, 0 to disable
@ -27,7 +28,8 @@ styling_within_preprocessor=1;0;false;false
[keywords]
# all items must be in one line
primary=__FILE__ __LINE__ __DATA__ __TIME__ __TIMESTAMP__ abstract alias align asm assert auto body bool break byte case cast catch cdouble cent cfloat char class const continue creal dchar debug default delegate delete deprecated do double else enum export extern false final finally float for foreach function goto idouble if ifloat import in inout int interface invariant ireal is long mixin module new null out override package pragma private protected public real return scope short static struct super switch synchronized template this throw true try typedef typeof ubyte ucent uint ulong union unittest ushort version void volatile wchar while with
docComment=TODO FIXME
# documentation keywords for D, currently not working
docComment=Authors Bugs Copyright Date Deprecated Examples History License Macros Params Returns See_Also Standards Throws Version
[settings]
# the following characters are these which a "word" can contains, see documentation

1
data/filetypes.ferite
View File

@ -19,6 +19,7 @@ verbatim=0x101030;0xffffff;false;false
regex=0x105090;0xffffff;false;false
commentlinedoc=0x3f5fbf;0xffffff;true;false
commentdockeyword=0x3f5fbf;0xffffff;true;true
commentdockeyworderror=0x3f5fbf;0xffffff;false;false
globalclass=0x0000d0;0xffffff;true;false
[keywords]

4
data/filetypes.java
View File

@ -19,12 +19,14 @@ verbatim=0x101030;0xffffff;false;false
regex=0x105090;0xffffff;false;false
commentlinedoc=0x3f5fbf;0xffffff;true;false
commentdockeyword=0x3f5fbf;0xffffff;true;true
commentdockeyworderror=0x3f5fbf;0xffffff;false;false
globalclass=0x0000d0;0xffffff;true;false
[keywords]
primary=abstract assert break case catch class const continue default do else extends final finally for future generic goto if implements import inner instanceof interface native new outer package private protected public rest return static super switch synchronized this throw throws transient try var volatile while true false null
secondary=boolean byte char double float int long null short void
doccomment=return param author throws
# documentation keywords for javadoc
doccomment=author deprecated exception param return see serial serialData serialField since throws todo version
typedefs=

39
src/highlighting.c
View File

@ -603,18 +603,19 @@ static void init_c_like_styleset(GKeyFile *config, GKeyFile *config_home, gint f
{"regex", &regex},
{"commentlinedoc", &gsd_comment_doc},
{"commentdockeyword", &gsd_comment_doc},
{"commentdockeyworderror", &gsd_comment_doc},
{"globalclass", &gsd_user_word}
};
gint i;
new_style_array(filetype_idx, 20);
new_style_array(filetype_idx, 21);
for (i = 0; i < 19; i++)
for (i = 0; i < 20; i++)
get_keyfile_style(config, config_home, entries[i].name, entries[i].style,
&style_sets[filetype_idx].styling[i]);
get_keyfile_int(config, config_home, "styling", "styling_within_preprocessor",
1, 0, &style_sets[filetype_idx].styling[19]);
1, 0, &style_sets[filetype_idx].styling[20]);
}
@ -689,13 +690,12 @@ void styleset_c(ScintillaObject *sci)
set_sci_style(sci, SCE_C_REGEX, GEANY_FILETYPES_C, 15);
set_sci_style(sci, SCE_C_COMMENTLINEDOC, GEANY_FILETYPES_C, 16);
set_sci_style(sci, SCE_C_COMMENTDOCKEYWORD, GEANY_FILETYPES_C, 17);
// use for unknown doc keywords (/** @something */) the same style as for known keywords
set_sci_style(sci, SCE_C_COMMENTDOCKEYWORDERROR, GEANY_FILETYPES_C, 17);
set_sci_style(sci, SCE_C_COMMENTDOCKEYWORDERROR, GEANY_FILETYPES_C, 18);
// is used for local structs and typedefs
set_sci_style(sci, SCE_C_GLOBALCLASS, GEANY_FILETYPES_C, 18);
set_sci_style(sci, SCE_C_GLOBALCLASS, GEANY_FILETYPES_C, 19);
if (style_sets[GEANY_FILETYPES_C].styling[19].foreground == 1)
if (style_sets[GEANY_FILETYPES_C].styling[20].foreground == 1)
SSM(sci, SCI_SETPROPERTY, (sptr_t) "styling.within.preprocessor", (sptr_t) "1");
SSM(sci, SCI_SETPROPERTY, (sptr_t) "preprocessor.symbol.$(file.patterns.cpp)", (sptr_t) "#");
SSM(sci, SCI_SETPROPERTY, (sptr_t) "preprocessor.start.$(file.patterns.cpp)", (sptr_t) "if ifdef ifndef");
@ -773,13 +773,12 @@ void styleset_cpp(ScintillaObject *sci)
set_sci_style(sci, SCE_C_REGEX, GEANY_FILETYPES_CPP, 15);
set_sci_style(sci, SCE_C_COMMENTLINEDOC, GEANY_FILETYPES_CPP, 16);
set_sci_style(sci, SCE_C_COMMENTDOCKEYWORD, GEANY_FILETYPES_CPP, 17);
// use for unknown doc keywords (/** @something */) the same style as for known keywords
set_sci_style(sci, SCE_C_COMMENTDOCKEYWORDERROR, GEANY_FILETYPES_CPP, 17);
set_sci_style(sci, SCE_C_COMMENTDOCKEYWORDERROR, GEANY_FILETYPES_CPP, 18);
// is used for local structs and typedefs
set_sci_style(sci, SCE_C_GLOBALCLASS, GEANY_FILETYPES_CPP, 18);
set_sci_style(sci, SCE_C_GLOBALCLASS, GEANY_FILETYPES_CPP, 19);
if (style_sets[GEANY_FILETYPES_CPP].styling[19].foreground == 1)
if (style_sets[GEANY_FILETYPES_CPP].styling[20].foreground == 1)
SSM(sci, SCI_SETPROPERTY, (sptr_t) "styling.within.preprocessor", (sptr_t) "1");
SSM(sci, SCI_SETPROPERTY, (sptr_t) "preprocessor.symbol.$(file.patterns.cpp)", (sptr_t) "#");
SSM(sci, SCI_SETPROPERTY, (sptr_t) "preprocessor.start.$(file.patterns.cpp)", (sptr_t) "if ifdef ifndef");
@ -1453,10 +1452,8 @@ void styleset_java(ScintillaObject *sci)
set_sci_style(sci, SCE_C_REGEX, GEANY_FILETYPES_JAVA, 15);
set_sci_style(sci, SCE_C_COMMENTLINEDOC, GEANY_FILETYPES_JAVA, 16);
set_sci_style(sci, SCE_C_COMMENTDOCKEYWORD, GEANY_FILETYPES_JAVA, 17);
// use for unknown doc keywords (/** @something */) the same style as for known keywords
set_sci_style(sci, SCE_C_COMMENTDOCKEYWORDERROR, GEANY_FILETYPES_JAVA, 17);
set_sci_style(sci, SCE_C_GLOBALCLASS, GEANY_FILETYPES_JAVA, 18);
set_sci_style(sci, SCE_C_COMMENTDOCKEYWORDERROR, GEANY_FILETYPES_JAVA, 18);
set_sci_style(sci, SCE_C_GLOBALCLASS, GEANY_FILETYPES_JAVA, 19);
}
@ -2619,11 +2616,9 @@ void styleset_d(ScintillaObject *sci)
set_sci_style(sci, SCE_C_REGEX, GEANY_FILETYPES_D, 15);
set_sci_style(sci, SCE_C_COMMENTLINEDOC, GEANY_FILETYPES_D, 16);
set_sci_style(sci, SCE_C_COMMENTDOCKEYWORD, GEANY_FILETYPES_D, 17);
// use for unknown doc keywords (/** @something */) the same style as for known keywords
set_sci_style(sci, SCE_C_COMMENTDOCKEYWORDERROR, GEANY_FILETYPES_D, 17);
set_sci_style(sci, SCE_C_COMMENTDOCKEYWORDERROR, GEANY_FILETYPES_D, 18);
// is used for local structs and typedefs
set_sci_style(sci, SCE_C_GLOBALCLASS, GEANY_FILETYPES_D, 18);
set_sci_style(sci, SCE_C_GLOBALCLASS, GEANY_FILETYPES_D, 19);
}
@ -2685,11 +2680,9 @@ void styleset_ferite(ScintillaObject *sci)
set_sci_style(sci, SCE_C_REGEX, GEANY_FILETYPES_FERITE, 15);
set_sci_style(sci, SCE_C_COMMENTLINEDOC, GEANY_FILETYPES_FERITE, 16);
set_sci_style(sci, SCE_C_COMMENTDOCKEYWORD, GEANY_FILETYPES_FERITE, 17);
// use for unknown doc keywords (/** @something */) the same style as for known keywords
set_sci_style(sci, SCE_C_COMMENTDOCKEYWORDERROR, GEANY_FILETYPES_FERITE, 17);
set_sci_style(sci, SCE_C_COMMENTDOCKEYWORDERROR, GEANY_FILETYPES_FERITE, 18);
// is used for local structs and typedefs
set_sci_style(sci, SCE_C_GLOBALCLASS, GEANY_FILETYPES_FERITE, 18);
set_sci_style(sci, SCE_C_GLOBALCLASS, GEANY_FILETYPES_FERITE, 19);
}