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

Make 'Reload Configuration' command also reload ignore.tags.

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3278 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2008-11-25 12:09:08 +00:00
parent bea7bbab00
commit d05dca5468
4 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-11-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/main.c, src/symbols.c, src/symbols.h:
Make 'Reload Configuration' command also reload ignore.tags.
2008-11-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> 2008-11-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* tagmanager/c.c: * tagmanager/c.c:

3
src/main.c
View File

@ -1186,5 +1186,8 @@ void main_reload_configuration(void)
filetypes_load_config(i, TRUE); filetypes_load_config(i, TRUE);
} }
/* C tag names to ignore */
symbols_reload_config_files();
ui_set_statusbar(TRUE, _("Configuration files reloaded.")); ui_set_statusbar(TRUE, _("Configuration files reloaded."));
} }

9
src/symbols.c
View File

@ -107,6 +107,8 @@ static void load_user_tags(filetype_id ft_id);
/* get the tags_ignore list, exported by tagmanager's options.c */ /* get the tags_ignore list, exported by tagmanager's options.c */
extern gchar **c_tags_ignore; extern gchar **c_tags_ignore;
/* ignore certain tokens when parsing C-like syntax.
* Also works for reloading. */
static void load_c_ignore_tags(void) static void load_c_ignore_tags(void)
{ {
gchar *path = g_strconcat(app->configdir, G_DIR_SEPARATOR_S "ignore.tags", NULL); gchar *path = g_strconcat(app->configdir, G_DIR_SEPARATOR_S "ignore.tags", NULL);
@ -114,6 +116,7 @@ static void load_c_ignore_tags(void)
if (g_file_get_contents(path, &content, NULL, NULL)) if (g_file_get_contents(path, &content, NULL, NULL))
{ {
g_strfreev(c_tags_ignore);
c_tags_ignore = g_strsplit_set(content, " \n\r", -1); c_tags_ignore = g_strsplit_set(content, " \n\r", -1);
g_free(content); g_free(content);
} }
@ -121,6 +124,12 @@ static void load_c_ignore_tags(void)
} }
void symbols_reload_config_files(void)
{
load_c_ignore_tags();
}
/* Ensure that the global tags file(s) for the file_type_idx filetype is loaded. /* Ensure that the global tags file(s) for the file_type_idx filetype is loaded.
* This provides autocompletion, calltips, etc. */ * This provides autocompletion, calltips, etc. */
void symbols_global_tags_loaded(gint file_type_idx) void symbols_global_tags_loaded(gint file_type_idx)

2
src/symbols.h
View File

@ -39,6 +39,8 @@ void symbols_init(void);
void symbols_finalize(void); void symbols_finalize(void);
void symbols_reload_config_files(void);
void symbols_global_tags_loaded(gint file_type_idx); void symbols_global_tags_loaded(gint file_type_idx);
GString *symbols_find_tags_as_string(GPtrArray *tags_array, guint tag_types, gint lang); GString *symbols_find_tags_as_string(GPtrArray *tags_array, guint tag_types, gint lang);