Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Thu, 28 Apr 2016 23:39:11 UTC Commit: 854a5d5af826c7dfbebc50dbcf687e508d7444c5 https://github.com/geany/geany/commit/854a5d5af826c7dfbebc50dbcf687e508d7444...
Log Message: ----------- Don't special-case tags files distributed with Geany
Load those tags files just as any user tags files, removing unnecessary code redundancy.
Modified Paths: -------------- data/Makefile.am data/tags/entities.html.tags data/tags/std.pas.tags data/tags/std.php.tags data/tags/std.py.tags data/tags/std99.c.tags src/symbols.c
Modified: data/Makefile.am 10 lines changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -73,11 +73,11 @@ filetypes = \ filedefs/filetypes.zephir
tagfiles = \ - tags/c99.tags \ - tags/php.tags \ - tags/python.tags \ - tags/pascal.tags \ - tags/html_entities.tags + tags/std99.c.tags \ + tags/std.php.tags \ + tags/std.py.tags \ + tags/std.pas.tags \ + tags/entities.html.tags
template_files = \ templates/files/file.html \
Modified: data/tags/entities.html.tags 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: data/tags/std.pas.tags 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: data/tags/std.php.tags 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: data/tags/std.py.tags 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: data/tags/std99.c.tags 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: src/symbols.c 52 lines changed, 1 insertions(+), 51 deletions(-) =================================================================== @@ -64,34 +64,6 @@ #include <stdlib.h>
-typedef struct -{ - gboolean tags_loaded; - const gchar *tag_file; -} TagFileInfo; - -/* Check before adding any more tags files, usually they should be downloaded separately. */ -enum /* Geany tag files */ -{ - GTF_C, - GTF_PASCAL, - GTF_PHP, - GTF_HTML_ENTITIES, - GTF_LATEX, - GTF_PYTHON, - GTF_MAX -}; - -static TagFileInfo tag_file_info[GTF_MAX] = -{ - {FALSE, "c99.tags"}, - {FALSE, "pascal.tags"}, - {FALSE, "php.tags"}, - {FALSE, "html_entities.tags"}, - {FALSE, "latex.tags"}, - {FALSE, "python.tags"} -}; - static GPtrArray *top_level_iter_names = NULL;
enum @@ -198,9 +170,6 @@ static gboolean symbols_load_global_tags(const gchar *tags_file, GeanyFiletype * * This provides autocompletion, calltips, etc. */ void symbols_global_tags_loaded(guint file_type_idx) { - TagFileInfo *tfi; - gint tag_type; - /* load ignore list for C/C++ parser */ if ((file_type_idx == GEANY_FILETYPES_C || file_type_idx == GEANY_FILETYPES_CPP) && c_tags_ignore == NULL) @@ -220,29 +189,10 @@ void symbols_global_tags_loaded(guint file_type_idx) { case GEANY_FILETYPES_CPP: symbols_global_tags_loaded(GEANY_FILETYPES_C); /* load C global tags */ - /* no C++ tagfile yet */ - return; - case GEANY_FILETYPES_C: tag_type = GTF_C; break; - case GEANY_FILETYPES_PASCAL:tag_type = GTF_PASCAL; break; - case GEANY_FILETYPES_LATEX: tag_type = GTF_LATEX; break; - case GEANY_FILETYPES_PYTHON:tag_type = GTF_PYTHON; break; - case GEANY_FILETYPES_HTML: tag_type = GTF_HTML_ENTITIES; break; + break; case GEANY_FILETYPES_PHP: symbols_global_tags_loaded(GEANY_FILETYPES_HTML); /* load HTML global tags */ - tag_type = GTF_PHP; break; - default: - return; - } - tfi = &tag_file_info[tag_type]; - - if (! tfi->tags_loaded) - { - gchar *fname = g_build_filename(app->datadir, GEANY_TAGS_SUBDIR, tfi->tag_file, NULL); - - symbols_load_global_tags(fname, filetypes[file_type_idx]); - tfi->tags_loaded = TRUE; - g_free(fname); } }
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).