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

Report scope including classes, namespaces and alike

Browse Source 
Don't only match the current function as the current scope, but also
classes, namespaces and others containers.

Closes #1996778.
This commit is contained in:
Colomban Wendling 2012-09-17 22:51:36 +02:00
parent 491a45f614
commit 8289e8f962
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/symbols.c
View File

@ -2204,6 +2204,20 @@ gint symbols_get_current_function(GeanyDocument *doc, const gchar **tagname)
}
/* same as symbols_get_current_function() but finds class, namespaces and more */
gint symbols_get_current_scope(GeanyDocument *doc, const gchar **tagname)
{
guint tag_types = (tm_tag_function_t | tm_tag_method_t | tm_tag_class_t |
tm_tag_struct_t | tm_tag_enum_t | tm_tag_union_t);
/* Python parser reports imports as namespaces which confuses the scope detection */
if (doc && doc->file_type->lang != filetypes[GEANY_FILETYPES_PYTHON]->lang)
tag_types |= tm_tag_namespace_t;
return get_current_tag_name_cached(doc, tagname, tag_types);
}
static void on_symbol_tree_sort_clicked(GtkMenuItem *menuitem, gpointer user_data)
{
gint sort_mode = GPOINTER_TO_INT(user_data);

2
src/symbols.h
View File

@ -61,4 +61,6 @@ gboolean symbols_goto_tag(const gchar *name, gboolean definition);
gint symbols_get_current_function(GeanyDocument *doc, const gchar **tagname);
gint symbols_get_current_scope(GeanyDocument *doc, const gchar **tagname);
#endif

2
src/ui_utils.c
View File

@ -272,7 +272,7 @@ static void add_statusbar_statistics(GString *stats_str,
g_string_append(stats_str, filetypes_get_display_name(doc->file_type));
break;
case 'S':
symbols_get_current_function(doc, &cur_tag);
symbols_get_current_scope(doc, &cur_tag);
g_string_append(stats_str, cur_tag);
break;
default: