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

Fix sorting tags whose scope name doesn't have a tag (e.g. for C++

Browse Source 
source file methods with class definition in a header file).


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/symbol-tree@3172 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2008-11-04 18:14:04 +00:00
parent 3b25dca469
commit 1d69b53f57
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-11-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/symbols.c:
Fix sorting tags whose scope name doesn't have a tag (e.g. for C++
source file methods with class definition in a header file).
2008-11-03 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* treeviews.c, treeviews.h, symbols.c:

18
src/symbols.c
View File

@ -1061,6 +1061,14 @@ static gint compare_top_level_names(const gchar *a, const gchar *b)
}
/* Whether iters can be sorted based on tag name and line, not scope.
* If the scope was prepended, e.g. 'ScopeNameWithNoTag::TagName', this returns FALSE */
#define tag_is_name_sortable(tag, iter) \
((tag) && \
(!NZV((tag)->atts.entry.scope) || \
gtk_tree_store_iter_depth(GTK_TREE_STORE(model), (iter)) > 1))
static gint tree_sort_func(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b,
gpointer user_data)
{
@ -1070,7 +1078,8 @@ static gint tree_sort_func(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b,
gtk_tree_model_get(model, a, SYMBOLS_COLUMN_TAG, &tag_a, -1);
gtk_tree_model_get(model, b, SYMBOLS_COLUMN_TAG, &tag_b, -1);
if (tag_a && tag_b)
if (tag_is_name_sortable(tag_a, a) &&
tag_is_name_sortable(tag_b, b))
{
return sort_by_name ? compare_symbol(tag_a, tag_b) :
compare_symbol_lines(tag_a, tag_b);
@ -1085,10 +1094,17 @@ static gint tree_sort_func(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b,
/* if a is toplevel, b must be also */
if (gtk_tree_store_iter_depth(GTK_TREE_STORE(model), a) == 0)
{
cmp = compare_top_level_names(astr, bstr);
}
else
{
cmp = strcmp(astr, bstr);
/* sort duplicate 'ScopeName::OverloadedTagName' items by line as well */
if ((!sort_by_name || cmp == 0) && tag_a && tag_b)
cmp = tag_a->atts.entry.line - tag_b->atts.entry.line;
}
g_free(astr);
g_free(bstr);
return cmp;