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

Add two missing highlight styles to filetype Ruby.

Browse Source 
Enable comment/uncomment for POD-like comments for filetypes Ruby and Perl.	 


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@2179 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2008-01-17 14:30:40 +00:00
parent 264a7e449e
commit 012622a209
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-01-17 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* data/filetypes.ruby, src/editor.c, src/highlighting.c:
Add two missing highlight styles to filetype Ruby.
Enable comment/uncomment for POD-like comments for filetypes Ruby
and Perl.
2008-01-16 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* geany.glade, src/interface.c, src/keyfile.c, src/prefs.c,

2
data/filetypes.ruby
View File

@ -34,6 +34,8 @@ string_qx=0x000000;0xe0c0e0;false;false
string_qr=0x105090;0xffffff;false;false
string_qw=0x105090;0xffffff;false;false
upper_bound=0x000000;0xffffff;false;false
error=0xe500cc;0xffffff;false;false
pod=0x035650;0xffffff;false;false
[keywords]
# all items must be in one line

2
src/editor.c
View File

@ -1779,6 +1779,8 @@ void editor_do_comment_toggle(gint idx)
case SCLEX_SQL: style_comment = SCE_SQL_COMMENT; break;
case SCLEX_CAML: style_comment = SCE_CAML_COMMENT; break;
case SCLEX_D: style_comment = SCE_D_COMMENT; break;
case SCLEX_RUBY: style_comment = SCE_RB_POD; break;
case SCLEX_PERL: style_comment = SCE_PL_POD; break;
default: style_comment = SCE_C_COMMENT;
}
if (sci_get_style_at(doc_list[idx].sci, line_start + x) == style_comment)

6
src/highlighting.c
View File

@ -1518,7 +1518,7 @@ static void styleset_python(ScintillaObject *sci)
static void styleset_ruby_init(gint ft_id, GKeyFile *config, GKeyFile *config_home)
{
new_style_array(GEANY_FILETYPES_RUBY, 33);
new_style_array(GEANY_FILETYPES_RUBY, 35);
get_keyfile_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_RUBY].styling[0]);
get_keyfile_style(config, config_home, "commentline", &gsd_comment, &style_sets[GEANY_FILETYPES_RUBY].styling[1]);
get_keyfile_hex(config, config_home, "styling", "number", "0x400080", "0xffffff", "false", &style_sets[GEANY_FILETYPES_RUBY].styling[2]);
@ -1552,6 +1552,8 @@ static void styleset_ruby_init(gint ft_id, GKeyFile *config, GKeyFile *config_ho
get_keyfile_hex(config, config_home, "styling", "string_qr", "0x105090", "0xffffff", "false", &style_sets[GEANY_FILETYPES_RUBY].styling[30]);
get_keyfile_hex(config, config_home, "styling", "string_qw", "0x105090", "0xffffff", "false", &style_sets[GEANY_FILETYPES_RUBY].styling[31]);
get_keyfile_hex(config, config_home, "styling", "upper_bound", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_RUBY].styling[32]);
get_keyfile_hex(config, config_home, "styling", "error", "0xe500cc", "0xffffff", "false", &style_sets[GEANY_FILETYPES_RUBY].styling[33]);
get_keyfile_hex(config, config_home, "styling", "pod", "0x035650", "0xffffff", "false", &style_sets[GEANY_FILETYPES_RUBY].styling[34]);
style_sets[GEANY_FILETYPES_RUBY].keywords = g_new(gchar*, 2);
get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_RUBY, 0, "load define_method attr_accessor attr_writer attr_reader include __FILE__ and def end in or self unless __LINE__ begin defined? ensure module redo super until BEGIN break do false next rescue then when END case else for nil require retry true while alias class elsif if not return undef yield");
@ -1606,6 +1608,8 @@ static void styleset_ruby(ScintillaObject *sci)
set_sci_style(sci, SCE_RB_STRING_QR, GEANY_FILETYPES_RUBY, 30);
set_sci_style(sci, SCE_RB_STRING_QW, GEANY_FILETYPES_RUBY, 31);
set_sci_style(sci, SCE_RB_UPPER_BOUND, GEANY_FILETYPES_RUBY, 32);
set_sci_style(sci, SCE_RB_ERROR, GEANY_FILETYPES_RUBY, 33);
set_sci_style(sci, SCE_RB_POD, GEANY_FILETYPES_RUBY, 34);
}