Commits February 2016

commits@lists.geany.org

1 participants
146 discussions

[geany/geany] 7a3d6a: Filter scope autocompletion list based on user input
by Jiří Techet 11 Feb '16

11 Feb '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 18 Jan 2016 21:56:10 UTC Commit: 7a3d6a4ee1e743aec67c7a27c20ed1714f1250ea https://github.com/geany/geany/commit/7a3d6a4ee1e743aec67c7a27c20ed1714f125… Log Message: ----------- Filter scope autocompletion list based on user input When scope autocompletion list shows, start filtering it when when the user types some more characters. As long as the list is non-empty, don't switch to normal autocompletion and show only the scope autocompletion results. Modified Paths: -------------- src/editor.c Modified: src/editor.c 61 lines changed, 55 insertions(+), 6 deletions(-) =================================================================== @@ -75,6 +75,7 @@ static GHashTable *snippet_hash = NULL; static GQueue *snippet_offsets = NULL; static gint snippet_cursor_insert_pos; static GtkAccelGroup *snippet_accel_group = NULL; +static gboolean autocomplete_scope_shown = FALSE; static const gchar geany_cursor_marker[] = "__GEANY_CURSOR_MARKER__"; @@ -699,7 +700,7 @@ static void request_reshowing_calltip(SCNotification *nt) } -static void autocomplete_scope(GeanyEditor *editor) +static gboolean autocomplete_scope(GeanyEditor *editor, const gchar *root, gsize rootlen) { ScintillaObject *sci = editor->sci; gint pos = sci_get_current_position(editor->sci); @@ -709,8 +710,22 @@ static void autocomplete_scope(GeanyEditor *editor) GPtrArray *tags; gboolean function = FALSE; gboolean member; + gboolean ret = FALSE; const gchar *current_scope; + if (autocomplete_scope_shown) + { + /* move at the operator position */ + pos -= rootlen; + + /* allow for a space between word and operator */ + while (pos > 0 && isspace(sci_get_char_at(sci, pos - 1))) + pos--; + + if (pos > 0) + typed = sci_get_char_at(sci, pos - 1); + } + if (typed == '.') pos -= 1; else if (ft->id == GEANY_FILETYPES_C || ft->id == GEANY_FILETYPES_CPP || @@ -724,10 +739,10 @@ static void autocomplete_scope(GeanyEditor *editor) else if (ft->id == GEANY_FILETYPES_CPP && match_last_chars(sci, pos, "->*")) pos-=3; else - return; + return FALSE; } else - return; + return FALSE; /* allow for a space between word and operator */ while (pos > 0 && isspace(sci_get_char_at(sci, pos - 1))) @@ -751,7 +766,7 @@ static void autocomplete_scope(GeanyEditor *editor) name = editor_get_word_at_pos(editor, pos, NULL); if (!name) - return; + return FALSE; /* check if invoked on member */ pos -= strlen(name); @@ -766,11 +781,28 @@ static void autocomplete_scope(GeanyEditor *editor) member, current_scope); if (tags) { - show_tags_list(editor, tags, 0); + GPtrArray *filtered = g_ptr_array_new(); + TMTag *tag; + guint i; + + foreach_ptr_array(tag, i, tags) + { + if (g_str_has_prefix(tag->name, root)) + g_ptr_array_add(filtered, tag); + } + + if (filtered->len > 0) + { + show_tags_list(editor, filtered, rootlen); + ret = TRUE; + } + g_ptr_array_free(tags, TRUE); + g_ptr_array_free(filtered, TRUE); } g_free(name); + return ret; } @@ -1129,6 +1161,7 @@ static gboolean on_editor_notify(G_GNUC_UNUSED GObject *object, GeanyEditor *edi case SCN_AUTOCCANCELLED: /* now that autocomplete is finishing or was cancelled, reshow calltips * if they were showing */ + autocomplete_scope_shown = FALSE; request_reshowing_calltip(nt); break; @@ -2250,7 +2283,6 @@ gboolean editor_start_auto_complete(GeanyEditor *editor, gint pos, gboolean forc if (!force && !highlighting_is_code_style(lexer, style)) return FALSE; - autocomplete_scope(editor); ret = autocomplete_check_html(editor, style, pos); if (ft->id == GEANY_FILETYPES_LATEX) @@ -2264,6 +2296,23 @@ gboolean editor_start_auto_complete(GeanyEditor *editor, gint pos, gboolean forc root = cword; rootlen = strlen(root); + if (ret || force) + { + if (autocomplete_scope_shown) + { + autocomplete_scope_shown = FALSE; + if (!ret) + sci_send_command(sci, SCI_AUTOCCANCEL); + } + } + else + { + ret = autocomplete_scope(editor, root, rootlen); + if (!ret && autocomplete_scope_shown) + sci_send_command(sci, SCI_AUTOCCANCEL); + autocomplete_scope_shown = ret; + } + if (!ret && rootlen > 0) { if (ft->id == GEANY_FILETYPES_PHP && style == SCE_HPHP_DEFAULT && -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 02105d: Simplify tag type specifications in scope search
by Jiří Techet 11 Feb '16

11 Feb '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 18 Jan 2016 21:56:10 UTC Commit: 02105d77d74da4954dce165bba9ead31cbf5ed72 https://github.com/geany/geany/commit/02105d77d74da4954dce165bba9ead31cbf5e… Log Message: ----------- Simplify tag type specifications in scope search Consider types with members to have the same properties everywhere (this might differ language to language but this assumption should behave reasonably for any language). Don't check member type in find_scope_members_tags() - we already check scope which should be sufficient and will work even if some language uses function/variable instead of method/member/field. Modified Paths: -------------- tagmanager/src/tm_workspace.c Modified: tagmanager/src/tm_workspace.c 34 lines changed, 17 insertions(+), 17 deletions(-) =================================================================== @@ -56,6 +56,10 @@ static TMTagAttrType global_tags_sort_attrs[] = tm_tag_attr_type_t, tm_tag_attr_scope_t, tm_tag_attr_arglist_t, 0 }; +static TMTagType TM_TYPE_WITH_MEMBERS = + tm_tag_class_t | tm_tag_struct_t | tm_tag_union_t | + tm_tag_enum_t | tm_tag_interface_t; + static TMWorkspace *theWorkspace = NULL; @@ -756,10 +760,7 @@ GPtrArray *tm_workspace_find(const char *name, const char *scope, TMTagType type static GPtrArray * find_scope_members_tags (const GPtrArray *all, TMTag *type_tag, gboolean namespace) { - TMTagType member_types = - tm_tag_function_t | tm_tag_prototype_t | - tm_tag_member_t | tm_tag_field_t | - tm_tag_method_t; + TMTagType member_types = tm_tag_max_t & ~(TM_TYPE_WITH_MEMBERS | tm_tag_typedef_t); GPtrArray *tags = g_ptr_array_new(); gchar *scope; guint i; @@ -823,11 +824,10 @@ find_scope_members (const GPtrArray *tags_array, const char *name, langType lang { guint j; GPtrArray *type_tags; - TMTagType types = (tm_tag_class_t | tm_tag_struct_t | - tm_tag_union_t | tm_tag_typedef_t); + TMTagType types = TM_TYPE_WITH_MEMBERS | tm_tag_typedef_t; - if (namespace) - types |= tm_tag_enum_t; + if (!namespace) + types &= ~tm_tag_enum_t; type_tags = g_ptr_array_new(); if (tag && tag->file) @@ -913,8 +913,8 @@ static gboolean member_at_method_scope(const GPtrArray *tags, const gchar *metho GPtrArray *cls_tags = g_ptr_array_new(); /* check whether the class exists */ - fill_find_tags_array(cls_tags, src, cls, cls_scope, - tm_tag_class_t | tm_tag_struct_t | tm_tag_interface_t, FALSE, lang); + fill_find_tags_array(cls_tags, src, cls, cls_scope, TM_TYPE_WITH_MEMBERS, + FALSE, lang); ret = cls_tags->len > 0; g_ptr_array_free(cls_tags, TRUE); } @@ -941,8 +941,8 @@ find_scope_members_all(const GPtrArray *tags, const GPtrArray *searched_array, l for (i = 0; i < tags->len && !member_tags; i++) { TMTag *tag = TM_TAG(tags->pdata[i]); - TMTagType types = (tm_tag_class_t | tm_tag_struct_t | tm_tag_union_t | - tm_tag_enum_t | tm_tag_typedef_t); + TMTagType member_types = tm_tag_member_t | tm_tag_field_t | tm_tag_method_t; + TMTagType types = TM_TYPE_WITH_MEMBERS | tm_tag_typedef_t; if (tag->type & types) /* type: namespace search */ member_tags = find_scope_members(searched_array, tag->name, lang, TRUE); @@ -953,7 +953,7 @@ find_scope_members_all(const GPtrArray *tags, const GPtrArray *searched_array, l * (which means user has typed something like foo.bar.) or if we are * inside a method where foo is a class member, we want scope completion * for foo. */ - if (!(tag->type & (tm_tag_field_t | tm_tag_member_t)) || member || + if (!(tag->type & member_types) || member || member_at_method_scope(tags, current_scope, tag, lang)) { gchar *tag_type = g_strdup(tag->var_type); @@ -985,13 +985,13 @@ tm_workspace_find_scope_members (TMSourceFile *source_file, const char *name, { langType lang = source_file ? source_file->lang : -1; GPtrArray *tags, *member_tags = NULL; + TMTagType function_types = tm_tag_function_t | tm_tag_method_t | + tm_tag_macro_with_arg_t | tm_tag_prototype_t; TMTagType tag_type = tm_tag_max_t & - ~(tm_tag_enumerator_t | tm_tag_namespace_t | tm_tag_package_t | - tm_tag_macro_t | tm_tag_macro_with_arg_t | - tm_tag_function_t | tm_tag_method_t); + ~(function_types | tm_tag_enumerator_t | tm_tag_namespace_t | tm_tag_package_t); if (function) - tag_type = tm_tag_function_t | tm_tag_method_t; + tag_type = function_types; /* tags corresponding to the variable/type name */ tags = tm_workspace_find(name, NULL, tag_type, NULL, FALSE, lang); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 5b4c6f: Don't use anon_struct_* and similar members unless we are sure it's the right one
by Jiří Techet 11 Feb '16

11 Feb '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 18 Jan 2016 21:56:10 UTC Commit: 5b4c6f96b20cd309026e42c02133b28d1e0e64df https://github.com/geany/geany/commit/5b4c6f96b20cd309026e42c02133b28d1e0e6… Log Message: ----------- Don't use anon_struct_* and similar members unless we are sure it's the right one We can only be sure it's the right one if we previously resolved a typedef to it and the typedef was in the same file. Modified Paths: -------------- tagmanager/src/tm_workspace.c Modified: tagmanager/src/tm_workspace.c 7 lines changed, 6 insertions(+), 1 deletions(-) =================================================================== @@ -805,6 +805,7 @@ find_scope_members (const GPtrArray *tags_array, const char *name, langType lang gboolean namespace) { gboolean has_members = FALSE; + gboolean typedef_struct = FALSE; GPtrArray *tags = NULL; TMTag *tag = NULL; const gchar *type_name; @@ -839,6 +840,7 @@ find_scope_members (const GPtrArray *tags_array, const char *name, langType lang * too many (wrong) results. */ fill_find_tags_array(type_tags, tag->file->tags_array, type_name, NULL, types, FALSE, lang); + typedef_struct = type_tags->len > 0; } if (type_tags->len == 0) fill_find_tags_array(type_tags, tags_array, type_name, NULL, types, FALSE, lang); @@ -870,7 +872,10 @@ find_scope_members (const GPtrArray *tags_array, const char *name, langType lang } } - if (has_members) + /* ignore anon_struct_* and similar unless we resolved a typedef to it within + * a single file so we can be sure we don't pick a wrong anon_struct_* from + * a different file */ + if (has_members && (typedef_struct || !tm_tag_is_anon(tag))) /* use the same file as the composite type if file information available */ tags = find_scope_members_tags(tag->file ? tag->file->tags_array : tags_array, tag, namespace); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 2682d7: Remove anon_* elements when performing namespace search
by Jiří Techet 11 Feb '16

11 Feb '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 18 Jan 2016 21:56:10 UTC Commit: 2682d7973f0518ccfb3806901170ff8314c311c6 https://github.com/geany/geany/commit/2682d7973f0518ccfb3806901170ff8314c31… Log Message: ----------- Remove anon_* elements when performing namespace search These correspond to anonymous structs, enums, etc. but they don't have any name so the name shouldn't be listed. Modified Paths: -------------- tagmanager/src/tm_tag.c tagmanager/src/tm_tag.h tagmanager/src/tm_workspace.c Modified: tagmanager/src/tm_tag.c 14 lines changed, 14 insertions(+), 0 deletions(-) =================================================================== @@ -1197,6 +1197,20 @@ const gchar *tm_tag_context_separator(langType lang) } } +gboolean tm_tag_is_anon(const TMTag *tag) +{ + guint i; + char dummy; + + if (tag->lang == TM_PARSER_C || tag->lang == TM_PARSER_CPP) + return sscanf(tag->name, "anon_%*[a-z]_%u%c", &i, &dummy) == 1; + else if (tag->lang == TM_PARSER_FORTRAN || tag->lang == TM_PARSER_F77) + return sscanf(tag->name, "Structure#%u%c", &i, &dummy) == 1 || + sscanf(tag->name, "Interface#%u%c", &i, &dummy) == 1 || + sscanf(tag->name, "Enum#%u%c", &i, &dummy) == 1; + return FALSE; +} + #if 0 /* Returns TMTag to function or method which "own" given line @param line Current line in edited file. Modified: tagmanager/src/tm_tag.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -193,6 +193,8 @@ gboolean tm_tags_equal(const TMTag *a, const TMTag *b); const gchar *tm_tag_context_separator(langType lang); +gboolean tm_tag_is_anon(const TMTag *tag); + #ifdef TM_DEBUG /* various debugging functions */ const char *tm_tag_type_name(const TMTag *tag); Modified: tagmanager/src/tm_workspace.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -779,7 +779,8 @@ find_scope_members_tags (const GPtrArray *all, TMTag *type_tag, gboolean namespa if (tag && (tag->type & member_types) && tag->scope && tag->scope[0] != '\0' && langs_compatible(tag->lang, type_tag->lang) && - strcmp(scope, tag->scope) == 0) + strcmp(scope, tag->scope) == 0 && + (!namespace || !tm_tag_is_anon(tag))) { g_ptr_array_add (tags, tag); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 67916d: Use only binary search to find first/last element in a row of equal tags
by Jiří Techet 11 Feb '16

11 Feb '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 18 Jan 2016 21:56:10 UTC Commit: 67916dc4038918a940f38d08d073a9bbb4aea89b https://github.com/geany/geany/commit/67916dc4038918a940f38d08d073a9bbb4aea… Log Message: ----------- Use only binary search to find first/last element in a row of equal tags The linear part may become expensive when there are many equal tags which can happen when partial search, used for non-scope completion, is used. Modified Paths: -------------- tagmanager/src/tm_tag.c Modified: tagmanager/src/tm_tag.c 82 lines changed, 49 insertions(+), 33 deletions(-) =================================================================== @@ -109,6 +109,8 @@ typedef struct { guint *sort_attrs; gboolean partial; + const GPtrArray *tags_array; + gboolean first; } TMSortOptions; static const char *s_tag_type_names[] = { @@ -1084,6 +1086,31 @@ static gpointer binary_search(gpointer key, gpointer base, size_t nmemb, return NULL; } +static gint tag_search_cmp(gconstpointer ptr1, gconstpointer ptr2, gpointer user_data) +{ + gint res = tm_tag_compare(ptr1, ptr2, user_data); + + if (res == 0) + { + TMSortOptions *sort_options = user_data; + const GPtrArray *tags_array = sort_options->tags_array; + TMTag **tag = (TMTag **) ptr2; + + /* if previous/next (depending on sort options) tag equal, we haven't + * found the first/last tag in a sequence of equal tags yet */ + if (sort_options->first && ptr2 != &tags_array->pdata[0]) { + if (tm_tag_compare(ptr1, tag - 1, user_data) == 0) + return -1; + } + else if (!sort_options->first && ptr2 != &tags_array->pdata[tags_array->len-1]) + { + if (tm_tag_compare(ptr1, tag + 1, user_data) == 0) + return 1; + } + } + return res; +} + /* Returns a pointer to the position of the first matching tag in a (sorted) tags array. The passed array of tags must be already sorted by name (searched with binary search). @@ -1093,51 +1120,40 @@ static gpointer binary_search(gpointer key, gpointer base, size_t nmemb, @param tagCount Return location of the matched tags. */ TMTag **tm_tags_find(const GPtrArray *tags_array, const char *name, - gboolean partial, guint * tagCount) + gboolean partial, guint *tagCount) { - static TMTag *tag = NULL; - TMTag **result; - guint tagMatches=0; + TMTag *tag, **first; TMSortOptions sort_options; *tagCount = 0; - if ((!tags_array) || (!tags_array->len)) + if (!tags_array || !tags_array->len) return NULL; - if (NULL == tag) - tag = g_new0(TMTag, 1); + tag = g_new0(TMTag, 1); tag->name = (char *) name; + sort_options.sort_attrs = NULL; sort_options.partial = partial; + sort_options.tags_array = tags_array; + sort_options.first = TRUE; + first = (TMTag **)binary_search(&tag, tags_array->pdata, tags_array->len, + tag_search_cmp, &sort_options); - result = (TMTag **)binary_search(&tag, tags_array->pdata, tags_array->len, - tm_tag_compare, &sort_options); - /* There can be matches on both sides of result */ - if (result) + if (first) { - TMTag **last = (TMTag **) &tags_array->pdata[tags_array->len - 1]; - TMTag **adv; - - /* First look for any matches after result */ - adv = result; - adv++; - for (; adv <= last && *adv; ++ adv) - { - if (0 != tm_tag_compare(&tag, adv, &sort_options)) - break; - ++tagMatches; - } - /* Now look for matches from result and below */ - for (; result >= (TMTag **) tags_array->pdata; -- result) - { - if (0 != tm_tag_compare(&tag, (TMTag **) result, &sort_options)) - break; - ++tagMatches; - } - *tagCount=tagMatches; - ++ result; /* Correct address for the last successful match */ + TMTag **last; + unsigned first_pos; + + sort_options.first = FALSE; + first_pos = first - (TMTag **)tags_array->pdata; + /* search between the first element and end */ + last = (TMTag **)binary_search(&tag, first, tags_array->len - first_pos, + tag_search_cmp, &sort_options); + *tagCount = last - first + 1; } - return (TMTag **) result; + + g_free(tag); + return (TMTag **) first; } /* Returns TMTag which "own" given line -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 932dc7: Don't use struct/class/... member types when the edited text isn't a member
by Jiří Techet 11 Feb '16

11 Feb '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 18 Jan 2016 21:55:02 UTC Commit: 932dc71fe2edc0c58b15aface319d38855c5e612 https://github.com/geany/geany/commit/932dc71fe2edc0c58b15aface319d38855c5e… Log Message: ----------- Don't use struct/class/... member types when the edited text isn't a member For instance, consider class A { int a; int b; } class B { A c; void foo() { c. //<---- (3) } } int main() { c. //<---- (1) foo.c. //<---- (2) } Consider cases (1) and (2) first - in the case (1) scope completion shouldn't be performed because c isn't a global variable; however, in case (2) it should be performed because c is a member. To fix this, we can check whether the typed variable ('c' in this case) is preceeded by another dot - if it is, use member tags for scope completion; otherwise don't use them. There's one exception from this rule - in the case (3) we are accessing a member variable from a member function at the same scope so the function should have access to the variable. For this we can use the scope at the position of the cursor. It should be B::foo in this case, more generally ...::class_name::function_name. We need to check if class_name exists at the given scope and if the member variable we are trying to access is inside ...::class_name - if so, scope completion can be performed using member tags (without explicit invocation on a member). Modified Paths: -------------- src/editor.c tagmanager/src/tm_workspace.c tagmanager/src/tm_workspace.h Modified: src/editor.c 14 lines changed, 13 insertions(+), 1 deletions(-) =================================================================== @@ -708,6 +708,8 @@ static void autocomplete_scope(GeanyEditor *editor) GeanyFiletype *ft = editor->document->file_type; GPtrArray *tags; gboolean function = FALSE; + gboolean member; + const gchar *current_scope; if (typed == '.') pos -= 1; @@ -751,7 +753,17 @@ static void autocomplete_scope(GeanyEditor *editor) if (!name) return; - tags = tm_workspace_find_scope_members(editor->document->tm_file, name, function); + /* check if invoked on member */ + pos -= strlen(name); + while (pos > 0 && isspace(sci_get_char_at(sci, pos - 1))) + pos--; + member = match_last_chars(sci, pos, ".") || match_last_chars(sci, pos, "::") || + match_last_chars(sci, pos, "->") || match_last_chars(sci, pos, "->*"); + + if (symbols_get_current_scope(editor->document, &current_scope) == -1) + current_scope = ""; + tags = tm_workspace_find_scope_members(editor->document->tm_file, name, function, + member, current_scope); if (tags) { show_tags_list(editor, tags, 0); Modified: tagmanager/src/tm_workspace.c 88 lines changed, 77 insertions(+), 11 deletions(-) =================================================================== @@ -877,9 +877,60 @@ find_scope_members (const GPtrArray *tags_array, const char *name, langType lang } +/* Checks whether a member tag is directly accessible from method with method_scope */ +static gboolean member_at_method_scope(const GPtrArray *tags, const gchar *method_scope, TMTag *member_tag, + langType lang) +{ + const gchar *sep = tm_tag_context_separator(lang); + gboolean ret = FALSE; + gchar **comps; + guint len; + + /* method scope is in the form ...::class_name::method_name */ + comps = g_strsplit (method_scope, sep, 0); + len = g_strv_length(comps); + if (len > 1) + { + gchar *method, *member_scope, *cls, *cls_scope; + + /* get method/member scope */ + method = comps[len - 1]; + comps[len - 1] = NULL; + member_scope = g_strjoinv(sep, comps); + comps[len - 1] = method; + + /* get class scope */ + cls = comps[len - 2]; + comps[len - 2] = NULL; + cls_scope = g_strjoinv(sep, comps); + comps[len - 2] = cls; + + /* check whether member inside the class */ + if (g_strcmp0(member_tag->scope, member_scope) == 0) + { + const GPtrArray *src = member_tag->file ? member_tag->file->tags_array : tags; + GPtrArray *cls_tags = g_ptr_array_new(); + + /* check whether the class exists */ + fill_find_tags_array(cls_tags, src, cls, cls_scope, + tm_tag_class_t | tm_tag_struct_t | tm_tag_interface_t, FALSE, lang); + ret = cls_tags->len > 0; + g_ptr_array_free(cls_tags, TRUE); + } + + g_free(cls_scope); + g_free(member_scope); + } + + g_strfreev(comps); + return ret; +} + + /* For an array of variable/type tags, find members inside the types */ static GPtrArray * -find_scope_members_all(const GPtrArray *tags, const GPtrArray *searched_array, langType lang) +find_scope_members_all(const GPtrArray *tags, const GPtrArray *searched_array, langType lang, + gboolean member, const gchar *current_scope) { GPtrArray *member_tags = NULL; guint i; @@ -896,13 +947,22 @@ find_scope_members_all(const GPtrArray *tags, const GPtrArray *searched_array, l member_tags = find_scope_members(searched_array, tag->name, lang, TRUE); else if (tag->var_type) /* variable: scope search */ { - gchar *tag_type = g_strdup(tag->var_type); + /* The question now is whether we should use member tags (such as + * tm_tag_field_t, tm_tag_member_t) or not. We want them if member==TRUE + * (which means user has typed something like foo.bar.) or if we are + * inside a method where foo is a class member, we want scope completion + * for foo. */ + if (!(tag->type & (tm_tag_field_t | tm_tag_member_t)) || member || + member_at_method_scope(tags, current_scope, tag, lang)) + { + gchar *tag_type = g_strdup(tag->var_type); - /* remove pointers in case the type contains them */ - g_strdelimit(tag_type, "*^", ' '); - g_strstrip(tag_type); - member_tags = find_scope_members(searched_array, tag_type, lang, FALSE); - g_free(tag_type); + /* remove pointers in case the type contains them */ + g_strdelimit(tag_type, "*^", ' '); + g_strstrip(tag_type); + member_tags = find_scope_members(searched_array, tag_type, lang, FALSE); + g_free(tag_type); + } } } @@ -915,9 +975,12 @@ find_scope_members_all(const GPtrArray *tags, const GPtrArray *searched_array, l @param source_file TMSourceFile of the edited source file or NULL if not available @param name Name of the variable/type whose members are searched @param function TRUE if the name is a name of a function + @param member TRUE if invoked on class/struct member (e.g. after the last dot in foo.bar.) + @param current_scope The current scope in the editor @return A GPtrArray of TMTag pointers to struct/union/class members or NULL when not found */ GPtrArray * -tm_workspace_find_scope_members (TMSourceFile *source_file, const char *name, gboolean function) +tm_workspace_find_scope_members (TMSourceFile *source_file, const char *name, + gboolean function, gboolean member, const gchar *current_scope) { langType lang = source_file ? source_file->lang : -1; GPtrArray *tags, *member_tags = NULL; @@ -936,11 +999,14 @@ tm_workspace_find_scope_members (TMSourceFile *source_file, const char *name, gb * end with global tags. This way we find the "closest" tag to the current * file in case there are more of them. */ if (source_file) - member_tags = find_scope_members_all(tags, source_file->tags_array, lang); + member_tags = find_scope_members_all(tags, source_file->tags_array, + lang, member, current_scope); if (!member_tags) - member_tags = find_scope_members_all(tags, theWorkspace->tags_array, lang); + member_tags = find_scope_members_all(tags, theWorkspace->tags_array, lang, + member, current_scope); if (!member_tags) - member_tags = find_scope_members_all(tags, theWorkspace->global_tags, lang); + member_tags = find_scope_members_all(tags, theWorkspace->global_tags, lang, + member, current_scope); g_ptr_array_free(tags, TRUE); Modified: tagmanager/src/tm_workspace.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -59,7 +59,7 @@ GPtrArray *tm_workspace_find(const char *name, const char *scope, TMTagType type TMTagAttrType *attrs, gboolean partial, langType lang); GPtrArray *tm_workspace_find_scope_members (TMSourceFile *source_file, const char *name, - gboolean function); + gboolean function, gboolean member, const gchar *current_scope); void tm_workspace_add_source_file_noupdate(TMSourceFile *source_file); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 1281d0: Get members from the same file as the type/struct/union
by Jiří Techet 11 Feb '16

11 Feb '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 10 Jan 2016 11:33:40 UTC Commit: 1281d0c942322d99da626ad00edd6077425f2c8d https://github.com/geany/geany/commit/1281d0c942322d99da626ad00edd6077425f2… Log Message: ----------- Get members from the same file as the type/struct/union Rethink how to extract members from the struct types. Inspired by the patch using the same file as the typedef to search for structs, we can do the same to extract the members only from the file containing the struct and not the whole workspace. This makes this operation fast enough so we don't have to keep the extracted members in a special array (this will become especially useful for namespace search because for it we would have to extract all tags and then the extracted array would have the same size as the workspace so we'd lose the performance gain). Since the above works only for tags having the file information, that is, not the global tags, we'll lose some performance when searching the global tags. I think people don't create the tag files for complete projects but rather for header files which contain less tags and still the performance should be better than before this patch set because we go through the global tag list only once (was twice before). On the way, clean up the source a bit, add more comments and move some code from find_scope_members() to find_scope_members_tags(). Modified Paths: -------------- tagmanager/src/tm_workspace.c tagmanager/src/tm_workspace.h Modified: tagmanager/src/tm_workspace.c 107 lines changed, 42 insertions(+), 65 deletions(-) =================================================================== @@ -56,11 +56,6 @@ static TMTagAttrType global_tags_sort_attrs[] = tm_tag_attr_type_t, tm_tag_attr_scope_t, tm_tag_attr_arglist_t, 0 }; -static TMTagType TM_MEMBER_TYPE_MASK = - tm_tag_function_t | tm_tag_prototype_t | - tm_tag_member_t | tm_tag_field_t | - tm_tag_method_t; - static TMWorkspace *theWorkspace = NULL; @@ -73,8 +68,6 @@ static gboolean tm_create_workspace(void) theWorkspace->source_files = g_ptr_array_new(); theWorkspace->typename_array = g_ptr_array_new(); theWorkspace->global_typename_array = g_ptr_array_new(); - theWorkspace->member_array = g_ptr_array_new(); - theWorkspace->global_member_array = g_ptr_array_new(); return TRUE; } @@ -97,8 +90,6 @@ void tm_workspace_free(void) g_ptr_array_free(theWorkspace->tags_array, TRUE); g_ptr_array_free(theWorkspace->typename_array, TRUE); g_ptr_array_free(theWorkspace->global_typename_array, TRUE); - g_ptr_array_free(theWorkspace->member_array, TRUE); - g_ptr_array_free(theWorkspace->global_member_array, TRUE); g_free(theWorkspace); theWorkspace = NULL; } @@ -150,7 +141,6 @@ static void update_source_file(TMSourceFile *source_file, guchar* text_buf, * workspace while they exist and can be scanned */ tm_tags_remove_file_tags(source_file, theWorkspace->tags_array); tm_tags_remove_file_tags(source_file, theWorkspace->typename_array); - tm_tags_remove_file_tags(source_file, theWorkspace->member_array); } tm_source_file_parse(source_file, text_buf, buf_size, use_buffer); tm_tags_sort(source_file->tags_array, file_tags_sort_attrs, FALSE, TRUE); @@ -162,7 +152,6 @@ static void update_source_file(TMSourceFile *source_file, guchar* text_buf, tm_workspace_merge_tags(&theWorkspace->tags_array, source_file->tags_array); merge_extracted_tags(&(theWorkspace->typename_array), source_file->tags_array, TM_GLOBAL_TYPE_MASK); - merge_extracted_tags(&(theWorkspace->member_array), source_file->tags_array, TM_MEMBER_TYPE_MASK); } #ifdef TM_DEBUG else @@ -232,7 +221,6 @@ void tm_workspace_remove_source_file(TMSourceFile *source_file) { tm_tags_remove_file_tags(source_file, theWorkspace->tags_array); tm_tags_remove_file_tags(source_file, theWorkspace->typename_array); - tm_tags_remove_file_tags(source_file, theWorkspace->member_array); g_ptr_array_remove_index_fast(theWorkspace->source_files, i); return; } @@ -281,7 +269,6 @@ static void tm_workspace_update(void) g_ptr_array_free(theWorkspace->typename_array, TRUE); theWorkspace->typename_array = tm_tags_extract(theWorkspace->tags_array, TM_GLOBAL_TYPE_MASK); - theWorkspace->member_array = tm_tags_extract(theWorkspace->tags_array, TM_MEMBER_TYPE_MASK); } @@ -408,8 +395,6 @@ gboolean tm_workspace_load_global_tags(const char *tags_file, gint mode) g_ptr_array_free(theWorkspace->global_typename_array, TRUE); theWorkspace->global_typename_array = tm_tags_extract(new_tags, TM_GLOBAL_TYPE_MASK); - g_ptr_array_free(theWorkspace->global_member_array, TRUE); - theWorkspace->global_member_array = tm_tags_extract(new_tags, TM_MEMBER_TYPE_MASK); return TRUE; } @@ -761,33 +746,38 @@ GPtrArray *tm_workspace_find(const char *name, const char *scope, TMTagType type } +/* Gets all members of type_tag; search them inside the all array */ static GPtrArray * -find_scope_members_tags (const GPtrArray * all, const char *scope, langType lang, - TMSourceFile *tag_file) +find_scope_members_tags (const GPtrArray *all, TMTag *type_tag) { + TMTagType member_types = + tm_tag_function_t | tm_tag_prototype_t | + tm_tag_member_t | tm_tag_field_t | + tm_tag_method_t; GPtrArray *tags = g_ptr_array_new(); - TMSourceFile *last_file = tag_file; + gchar *scope; guint i; + if (type_tag->scope && *(type_tag->scope)) + scope = g_strconcat(type_tag->scope, tm_tag_context_separator(type_tag->lang), type_tag->name, NULL); + else + scope = g_strdup(type_tag->name); + for (i = 0; i < all->len; ++i) { TMTag *tag = TM_TAG (all->pdata[i]); - if (tag && (tag->file == last_file || last_file == NULL) && + if (tag && (tag->type & member_types) && tag->scope && tag->scope[0] != '\0' && - langs_compatible(tag->lang, lang) && + langs_compatible(tag->lang, type_tag->lang) && strcmp(scope, tag->scope) == 0) { g_ptr_array_add (tags, tag); - /* once set, always the same thanks to the if above - * add only if it's from the same file - this prevents mixing tags from - * structs with identical name (typically the anonymous ones) so we - * only get members from a single one. For workspace tags it adds - * all members because there's no file associated. */ - last_file = tag->file; } } + g_free(scope); + if (tags->len == 0) { g_ptr_array_free(tags, TRUE); @@ -798,48 +788,48 @@ find_scope_members_tags (const GPtrArray * all, const char *scope, langType lang } +/* Gets all members of the type with the given name; search them inside tags_array */ static GPtrArray * -find_scope_members (const GPtrArray *tags_array, GPtrArray *member_array, - const char *name, langType lang) +find_scope_members (const GPtrArray *tags_array, const char *name, langType lang) { - TMSourceFile *typedef_file = NULL; gboolean has_members = FALSE; GPtrArray *tags = NULL; - gchar *type_name; + TMTag *tag = NULL; + const gchar *type_name; guint i; g_return_val_if_fail(name && *name, NULL); - type_name = g_strdup(name); + type_name = name; /* First check if type_name is a type that can possibly contain members. * Try to resolve intermediate typedefs to get the real type name. Also * add scope information to the name if applicable. The only result of this - * part is the updated type_name and boolean has_members. + * part is the TMTag tag and boolean has_members. * The loop below loops only when resolving typedefs - avoid possibly infinite * loop when typedefs create a cycle by adding some limits. */ for (i = 0; i < 5; i++) { guint j; - TMTag *tag = NULL; GPtrArray *type_tags; TMTagType types = (tm_tag_class_t | tm_tag_namespace_t | tm_tag_struct_t | tm_tag_union_t | tm_tag_typedef_t); type_tags = g_ptr_array_new(); - if (typedef_file) + if (tag && tag->file) { - /* If we have typedef_file, which is the file where the typedef was - * defined, search in the file first. This helps for + /* If we have tag, it means it contains the typedef from the previous + * iteration; search in its file first. This helps for * "typedef struct {...}" cases where the typedef resolves to * anon_struct_* and searching for it in the whole workspace returns * too many (wrong) results. */ - fill_find_tags_array(type_tags, typedef_file->tags_array, type_name, + fill_find_tags_array(type_tags, tag->file->tags_array, type_name, NULL, types, FALSE, lang); } if (type_tags->len == 0) fill_find_tags_array(type_tags, tags_array, type_name, NULL, types, FALSE, lang); + tag = NULL; for (j = 0; j < type_tags->len; j++) { tag = TM_TAG(type_tags->pdata[j]); @@ -856,37 +846,28 @@ find_scope_members (const GPtrArray *tags_array, GPtrArray *member_array, /* intermediate typedef - resolve to the real type */ if (tag->type == tm_tag_typedef_t && tag->var_type && tag->var_type[0] != '\0') { - g_free(type_name); - type_name = g_strdup(tag->var_type); - typedef_file = tag->file; + type_name = tag->var_type; continue; } else /* real type with members */ { has_members = TRUE; - if (tag->scope && *(tag->scope)) - { - gchar *tmp_name = type_name; - - type_name = g_strconcat(tag->scope, tm_tag_context_separator(lang), type_name, NULL); - g_free(tmp_name); - } break; } } if (has_members) - tags = find_scope_members_tags(member_array, type_name, lang, typedef_file); - - g_free(type_name); + /* use the same file as the composite type if file information available */ + tags = find_scope_members_tags(tag->file ? tag->file->tags_array : tags_array, tag); return tags; } +/* For an array of variable tags var_array, find members inside their types */ static GPtrArray * find_scope_members_all(const GPtrArray *var_array, const GPtrArray *searched_array, - GPtrArray *member_array, langType lang) + langType lang) { GPtrArray *member_tags = NULL; guint i; @@ -899,8 +880,7 @@ find_scope_members_all(const GPtrArray *var_array, const GPtrArray *searched_arr if (tag->var_type) { - member_tags = find_scope_members(searched_array, member_array, - tag->var_type, lang); + member_tags = find_scope_members(searched_array, tag->var_type, lang); if (member_tags) break; } @@ -910,7 +890,8 @@ find_scope_members_all(const GPtrArray *var_array, const GPtrArray *searched_arr } -/* Returns all matching members tags found in given struct/union/class name. +/* Returns all member tags of a struct/union/class if the provided variable name is of such + a type. @param source_file TMSourceFile of the edited source file or NULL if not available @param name Name of the variable whose members are searched @return A GPtrArray of TMTag pointers to struct/union/class members or NULL when not found */ @@ -920,22 +901,18 @@ tm_workspace_find_scope_members (TMSourceFile *source_file, const char *name) langType lang = source_file ? source_file->lang : -1; GPtrArray *tags, *member_tags = NULL; + /* tags corresponding to the variable name */ tags = tm_workspace_find(name, NULL, tm_tag_max_t, NULL, FALSE, lang); + /* Start searching inside the source file, continue with workspace tags and + * end with global tags. This way we find the "closest" tag to the current + * file in case there are more of them. */ if (source_file) - { - GPtrArray *file_members = tm_tags_extract(source_file->tags_array, TM_MEMBER_TYPE_MASK); - - member_tags = find_scope_members_all(tags, source_file->tags_array, - file_members, lang); - g_ptr_array_free(file_members, TRUE); - } + member_tags = find_scope_members_all(tags, source_file->tags_array, lang); if (!member_tags) - member_tags = find_scope_members_all(tags, theWorkspace->tags_array, - theWorkspace->member_array, lang); + member_tags = find_scope_members_all(tags, theWorkspace->tags_array, lang); if (!member_tags) - member_tags = find_scope_members_all(tags, theWorkspace->global_tags, - theWorkspace->global_member_array, lang); + member_tags = find_scope_members_all(tags, theWorkspace->global_tags, lang); g_ptr_array_free(tags, TRUE); Modified: tagmanager/src/tm_workspace.h 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -34,8 +34,6 @@ typedef struct (just pointers to source file tags, the tag objects are owned by the source files) */ GPtrArray *typename_array; /* Typename tags for syntax highlighting (pointers owned by source files) */ GPtrArray *global_typename_array; /* Like above for global tags */ - GPtrArray *member_array; /* Typename tags for syntax highlighting (pointers owned by source files) */ - GPtrArray *global_member_array; /* Like above for global tags */ } TMWorkspace; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] c4b1cd: Perform "namespace" search (autocomplete for A:: where A is a type)
by Jiří Techet 11 Feb '16

11 Feb '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 10 Jan 2016 11:36:05 UTC Commit: c4b1cd49381a777274897ba2613fc89758acbb0a https://github.com/geany/geany/commit/c4b1cd49381a777274897ba2613fc89758acb… Log Message: ----------- Perform "namespace" search (autocomplete for A:: where A is a type) In principle this is very similar to the normal scope search. If the provided name belongs to a type that can contain members (contrary to a variable in scope search), perform the namespace search. With namespace search show all possible members that are at the given scope. Since we perform the scope search at file level, don't perform the namespace search for tags that can span multiple files otherwise we get incomplete results which could be confusing to users. This involves namespaces and packages. Modified Paths: -------------- tagmanager/src/tm_workspace.c Modified: tagmanager/src/tm_workspace.c 58 lines changed, 35 insertions(+), 23 deletions(-) =================================================================== @@ -746,9 +746,15 @@ GPtrArray *tm_workspace_find(const char *name, const char *scope, TMTagType type } -/* Gets all members of type_tag; search them inside the all array */ +/* Gets all members of type_tag; search them inside the all array. + * The namespace parameter determines whether we are performing the "namespace" + * search (user has typed something like "A::" where A is a type) or "scope" search + * (user has typed "a." where a is a global struct-like variable). With the + * namespace search we return all direct descendants of any type while with the + * scope search we return only those which can be invoked on a variable (member, + * method, etc.). */ static GPtrArray * -find_scope_members_tags (const GPtrArray *all, TMTag *type_tag) +find_scope_members_tags (const GPtrArray *all, TMTag *type_tag, gboolean namespace) { TMTagType member_types = tm_tag_function_t | tm_tag_prototype_t | @@ -758,6 +764,9 @@ find_scope_members_tags (const GPtrArray *all, TMTag *type_tag) gchar *scope; guint i; + if (namespace) + member_types = tm_tag_max_t; + if (type_tag->scope && *(type_tag->scope)) scope = g_strconcat(type_tag->scope, tm_tag_context_separator(type_tag->lang), type_tag->name, NULL); else @@ -790,7 +799,8 @@ find_scope_members_tags (const GPtrArray *all, TMTag *type_tag) /* Gets all members of the type with the given name; search them inside tags_array */ static GPtrArray * -find_scope_members (const GPtrArray *tags_array, const char *name, langType lang) +find_scope_members (const GPtrArray *tags_array, const char *name, langType lang, + gboolean namespace) { gboolean has_members = FALSE; GPtrArray *tags = NULL; @@ -812,8 +822,11 @@ find_scope_members (const GPtrArray *tags_array, const char *name, langType lang { guint j; GPtrArray *type_tags; - TMTagType types = (tm_tag_class_t | tm_tag_namespace_t | - tm_tag_struct_t | tm_tag_union_t | tm_tag_typedef_t); + TMTagType types = (tm_tag_class_t | tm_tag_struct_t | + tm_tag_union_t | tm_tag_typedef_t); + + if (namespace) + types |= tm_tag_enum_t; type_tags = g_ptr_array_new(); if (tag && tag->file) @@ -858,42 +871,41 @@ find_scope_members (const GPtrArray *tags_array, const char *name, langType lang if (has_members) /* use the same file as the composite type if file information available */ - tags = find_scope_members_tags(tag->file ? tag->file->tags_array : tags_array, tag); + tags = find_scope_members_tags(tag->file ? tag->file->tags_array : tags_array, tag, namespace); return tags; } -/* For an array of variable tags var_array, find members inside their types */ +/* For an array of variable/type tags, find members inside the types */ static GPtrArray * -find_scope_members_all(const GPtrArray *var_array, const GPtrArray *searched_array, - langType lang) +find_scope_members_all(const GPtrArray *tags, const GPtrArray *searched_array, langType lang) { GPtrArray *member_tags = NULL; guint i; - /* there may be several variables with the same name - try each of them until + /* there may be several variables/types with the same name - try each of them until * we find something */ - for (i = 0; i < var_array->len; i++) + for (i = 0; i < tags->len && !member_tags; i++) { - TMTag *tag = TM_TAG(var_array->pdata[i]); - - if (tag->var_type) - { - member_tags = find_scope_members(searched_array, tag->var_type, lang); - if (member_tags) - break; - } + TMTag *tag = TM_TAG(tags->pdata[i]); + TMTagType types = (tm_tag_class_t | tm_tag_struct_t | tm_tag_union_t | + tm_tag_enum_t | tm_tag_typedef_t); + + if (tag->type & types) /* type: namespace search */ + member_tags = find_scope_members(searched_array, tag->name, lang, TRUE); + else if (tag->var_type) /* variable: scope search */ + member_tags = find_scope_members(searched_array, tag->var_type, lang, FALSE); } return member_tags; } -/* Returns all member tags of a struct/union/class if the provided variable name is of such - a type. +/* Returns all member tags of a struct/union/class if the provided name is a variable + of such a type or the name of the type. @param source_file TMSourceFile of the edited source file or NULL if not available - @param name Name of the variable whose members are searched + @param name Name of the variable/type whose members are searched @return A GPtrArray of TMTag pointers to struct/union/class members or NULL when not found */ GPtrArray * tm_workspace_find_scope_members (TMSourceFile *source_file, const char *name) @@ -901,7 +913,7 @@ tm_workspace_find_scope_members (TMSourceFile *source_file, const char *name) langType lang = source_file ? source_file->lang : -1; GPtrArray *tags, *member_tags = NULL; - /* tags corresponding to the variable name */ + /* tags corresponding to the variable/type name */ tags = tm_workspace_find(name, NULL, tm_tag_max_t, NULL, FALSE, lang); /* Start searching inside the source file, continue with workspace tags and -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 4bc5f4: Popup scope autocompletion dialog in more cases
by Jiří Techet 11 Feb '16

11 Feb '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 10 Jan 2016 11:36:08 UTC Commit: 4bc5f4a7e482d577cdbff9badf422479cb19714b https://github.com/geany/geany/commit/4bc5f4a7e482d577cdbff9badf422479cb197… Log Message: ----------- Popup scope autocompletion dialog in more cases * for PHP and Rust scope separator :: * when there's more than one whitespace between the identifier and operator Modified Paths: -------------- src/editor.c Modified: src/editor.c 16 lines changed, 11 insertions(+), 5 deletions(-) =================================================================== @@ -657,7 +657,9 @@ static gboolean match_last_chars(ScintillaObject *sci, gint pos, const gchar *st gchar *buf; g_return_val_if_fail(len < 100, FALSE); - g_return_val_if_fail((gint)len <= pos, FALSE); + + if ((gint)len > pos) + return FALSE; buf = g_alloca(len + 1); sci_get_text_range(sci, pos - len, pos, buf); @@ -706,11 +708,15 @@ static void autocomplete_scope(GeanyEditor *editor) GeanyFiletype *ft = editor->document->file_type; GPtrArray *tags; - if (ft->id == GEANY_FILETYPES_C || ft->id == GEANY_FILETYPES_CPP) + if (ft->id == GEANY_FILETYPES_C || ft->id == GEANY_FILETYPES_CPP || + ft->id == GEANY_FILETYPES_PHP || ft->id == GEANY_FILETYPES_RUST) { - if (pos >= 2 && (match_last_chars(sci, pos, "->") || match_last_chars(sci, pos, "::"))) + if (match_last_chars(sci, pos, "::")) + pos--; + else if ((ft->id == GEANY_FILETYPES_C || ft->id == GEANY_FILETYPES_CPP) && + match_last_chars(sci, pos, "->")) pos--; - else if (ft->id == GEANY_FILETYPES_CPP && pos >= 3 && match_last_chars(sci, pos, "->*")) + else if (ft->id == GEANY_FILETYPES_CPP && match_last_chars(sci, pos, "->*")) pos-=2; else if (typed != '.') return; @@ -719,7 +725,7 @@ static void autocomplete_scope(GeanyEditor *editor) return; /* allow for a space between word and operator */ - if (isspace(sci_get_char_at(sci, pos - 2))) + while (pos >= 2 && isspace(sci_get_char_at(sci, pos - 2))) pos--; name = editor_get_word_at_pos(editor, pos - 1, NULL); if (!name) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] e01225: Perform scope autocompletion based on function return types
by Jiří Techet 11 Feb '16

11 Feb '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 10 Jan 2016 11:36:08 UTC Commit: e0122592d95f8cd5347729c3d15c05c40094edcd https://github.com/geany/geany/commit/e0122592d95f8cd5347729c3d15c05c40094e… Log Message: ----------- Perform scope autocompletion based on function return types We just need to skip the (...) and perform autocompletion as before. Shift pos by 1 in the whole function so we don't have to look 2 characters back (makes the function easier to read). Functions contain pointers in their return values - remove them before searching for the type. Also restrict the searched variable/function/type tags a bit only to types which make sense for the search. Modified Paths: -------------- src/editor.c tagmanager/src/tm_workspace.c tagmanager/src/tm_workspace.h Modified: src/editor.c 38 lines changed, 29 insertions(+), 9 deletions(-) =================================================================== @@ -707,31 +707,51 @@ static void autocomplete_scope(GeanyEditor *editor) gchar *name; GeanyFiletype *ft = editor->document->file_type; GPtrArray *tags; + gboolean function = FALSE; - if (ft->id == GEANY_FILETYPES_C || ft->id == GEANY_FILETYPES_CPP || + if (typed == '.') + pos -= 1; + else if (ft->id == GEANY_FILETYPES_C || ft->id == GEANY_FILETYPES_CPP || ft->id == GEANY_FILETYPES_PHP || ft->id == GEANY_FILETYPES_RUST) { if (match_last_chars(sci, pos, "::")) - pos--; + pos-=2; else if ((ft->id == GEANY_FILETYPES_C || ft->id == GEANY_FILETYPES_CPP) && match_last_chars(sci, pos, "->")) - pos--; - else if (ft->id == GEANY_FILETYPES_CPP && match_last_chars(sci, pos, "->*")) pos-=2; - else if (typed != '.') + else if (ft->id == GEANY_FILETYPES_CPP && match_last_chars(sci, pos, "->*")) + pos-=3; + else return; } - else if (typed != '.') + else return; /* allow for a space between word and operator */ - while (pos >= 2 && isspace(sci_get_char_at(sci, pos - 2))) + while (pos > 0 && isspace(sci_get_char_at(sci, pos - 1))) pos--; - name = editor_get_word_at_pos(editor, pos - 1, NULL); + + /* if function, skip to matching brace */ + if (pos > 0 && sci_get_char_at(sci, pos - 1) == ')') + { + gint brace_pos = sci_find_matching_brace(sci, pos - 1); + + if (brace_pos != -1) + { + pos = brace_pos; + function = TRUE; + } + + /* allow for a space between opening brace and function name */ + while (pos > 0 && isspace(sci_get_char_at(sci, pos - 1))) + pos--; + } + + name = editor_get_word_at_pos(editor, pos, NULL); if (!name) return; - tags = tm_workspace_find_scope_members(editor->document->tm_file, name); + tags = tm_workspace_find_scope_members(editor->document->tm_file, name, function); if (tags) { show_tags_list(editor, tags, 0); Modified: tagmanager/src/tm_workspace.c 22 lines changed, 19 insertions(+), 3 deletions(-) =================================================================== @@ -895,7 +895,15 @@ find_scope_members_all(const GPtrArray *tags, const GPtrArray *searched_array, l if (tag->type & types) /* type: namespace search */ member_tags = find_scope_members(searched_array, tag->name, lang, TRUE); else if (tag->var_type) /* variable: scope search */ - member_tags = find_scope_members(searched_array, tag->var_type, lang, FALSE); + { + gchar *tag_type = g_strdup(tag->var_type); + + /* remove pointers in case the type contains them */ + g_strdelimit(tag_type, "*^", ' '); + g_strstrip(tag_type); + member_tags = find_scope_members(searched_array, tag_type, lang, FALSE); + g_free(tag_type); + } } return member_tags; @@ -906,15 +914,23 @@ find_scope_members_all(const GPtrArray *tags, const GPtrArray *searched_array, l of such a type or the name of the type. @param source_file TMSourceFile of the edited source file or NULL if not available @param name Name of the variable/type whose members are searched + @param function TRUE if the name is a name of a function @return A GPtrArray of TMTag pointers to struct/union/class members or NULL when not found */ GPtrArray * -tm_workspace_find_scope_members (TMSourceFile *source_file, const char *name) +tm_workspace_find_scope_members (TMSourceFile *source_file, const char *name, gboolean function) { langType lang = source_file ? source_file->lang : -1; GPtrArray *tags, *member_tags = NULL; + TMTagType tag_type = tm_tag_max_t & + ~(tm_tag_enumerator_t | tm_tag_namespace_t | tm_tag_package_t | + tm_tag_macro_t | tm_tag_macro_with_arg_t | + tm_tag_function_t | tm_tag_method_t); + + if (function) + tag_type = tm_tag_function_t | tm_tag_method_t; /* tags corresponding to the variable/type name */ - tags = tm_workspace_find(name, NULL, tm_tag_max_t, NULL, FALSE, lang); + tags = tm_workspace_find(name, NULL, tag_type, NULL, FALSE, lang); /* Start searching inside the source file, continue with workspace tags and * end with global tags. This way we find the "closest" tag to the current Modified: tagmanager/src/tm_workspace.h 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -58,7 +58,8 @@ gboolean tm_workspace_create_global_tags(const char *pre_process, const char **i GPtrArray *tm_workspace_find(const char *name, const char *scope, TMTagType type, TMTagAttrType *attrs, gboolean partial, langType lang); -GPtrArray *tm_workspace_find_scope_members (TMSourceFile *source_file, const char *name); +GPtrArray *tm_workspace_find_scope_members (TMSourceFile *source_file, const char *name, + gboolean function); void tm_workspace_add_source_file_noupdate(TMSourceFile *source_file); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

← Newer
1
...
9
10
11
12
13
14
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2016