Commits September 2022

commits@lists.geany.org

1 participants
35 discussions

[geany/geany] b9891f: Added error_regex to filetypes.rust (#3300)
by Ben Young 22 Sep '22

22 Sep '22

Branch: refs/heads/master Author: Ben Young <by(a)computermouth.com> Committer: GitHub <noreply(a)github.com> Date: Thu, 22 Sep 2022 03:10:03 UTC Commit: b9891f2912a7e7374e3121f74b587af1e7b3901d https://github.com/geany/geany/commit/b9891f2912a7e7374e3121f74b587af1e7b39… Log Message: ----------- Added error_regex to filetypes.rust (#3300) Modified Paths: -------------- data/filedefs/filetypes.rust Modified: data/filedefs/filetypes.rust 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -81,3 +81,4 @@ EX_00_WD= EX_01_LB=Cargo Run EX_01_CM=cargo run EX_01_WD= +error_regex= --> (.+):([0-9]+):([0-9]+) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] fc852a: cxx: use a trashbox for deleteing tokens allocated for anonymous parameters
by Jiří Techet 21 Sep '22

21 Sep '22

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Fri, 13 May 2022 13:50:07 UTC Commit: fc852aa839acde3c0c854c20dc667d655771704a https://github.com/geany/geany/commit/fc852aa839acde3c0c854c20dc667d6557717… Log Message: ----------- cxx: use a trashbox for deleteing tokens allocated for anonymous parameters This is a cherry-picked commit 55ba7264c0722c9519c0fdfacdf2363ad1c59e94 from uctags to address a memory leak reported in https://github.com/universal-ctags/ctags/issues/3372 Modified Paths: -------------- ctags/parsers/cxx/cxx_parser_function.c Modified: ctags/parsers/cxx/cxx_parser_function.c 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1889,6 +1889,8 @@ void cxxParserEmitFunctionParameterTags(CXXTypedVariableSet * pInfo) if(pTypeName) { + if (pInfo->uAnonymous & (0x1u << i)) + PARSER_TRASH_BOX_TAKE_BACK (pInfo->aIdentifiers[i]); cxxTokenDestroy(pInfo->aIdentifiers[i]); cxxTokenDestroy(pTypeName); } @@ -2180,6 +2182,7 @@ bool cxxParserTokenChainLooksLikeFunctionParameterList( pIdentifier->iLineNumber = t->pPrev->iLineNumber; pIdentifier->oFilePosition = t->pPrev->oFilePosition; pParamInfo->uAnonymous |= (0x1u << pParamInfo->uCount); + PARSER_TRASH_BOX (pIdentifier, cxxTokenDestroy); } pParamInfo->aIdentifiers[pParamInfo->uCount] = pIdentifier; pParamInfo->uCount++; @@ -2233,7 +2236,7 @@ bool cxxParserTokenChainLooksLikeFunctionParameterList( pParamInfo->uCount++; PARSER_TRASH_BOX (pFakeStart, cxxTokenDestroy); - /* pFakeId may be destroyed via pParamInfo->aIdentifiers[i]. */ + PARSER_TRASH_BOX (pFakeId, cxxTokenDestroy); } if(cxxTokenTypeIs(t,CXXTokenTypeClosingParenthesis)) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 740377: Merge pull request #3203 from techee/cxx_mem_leak
by Jiří Techet 21 Sep '22

21 Sep '22

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Wed, 21 Sep 2022 21:36:07 UTC Commit: 740377e6d05ceb27145f41b731e521621ff2917a https://github.com/geany/geany/commit/740377e6d05ceb27145f41b731e521621ff29… Log Message: ----------- Merge pull request #3203 from techee/cxx_mem_leak cxx: use a trashbox for deleteing tokens allocated for anonymous parameters Modified Paths: -------------- ctags/parsers/cxx/cxx_parser_function.c Modified: ctags/parsers/cxx/cxx_parser_function.c 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1889,6 +1889,8 @@ void cxxParserEmitFunctionParameterTags(CXXTypedVariableSet * pInfo) if(pTypeName) { + if (pInfo->uAnonymous & (0x1u << i)) + PARSER_TRASH_BOX_TAKE_BACK (pInfo->aIdentifiers[i]); cxxTokenDestroy(pInfo->aIdentifiers[i]); cxxTokenDestroy(pTypeName); } @@ -2180,6 +2182,7 @@ bool cxxParserTokenChainLooksLikeFunctionParameterList( pIdentifier->iLineNumber = t->pPrev->iLineNumber; pIdentifier->oFilePosition = t->pPrev->oFilePosition; pParamInfo->uAnonymous |= (0x1u << pParamInfo->uCount); + PARSER_TRASH_BOX (pIdentifier, cxxTokenDestroy); } pParamInfo->aIdentifiers[pParamInfo->uCount] = pIdentifier; pParamInfo->uCount++; @@ -2233,7 +2236,7 @@ bool cxxParserTokenChainLooksLikeFunctionParameterList( pParamInfo->uCount++; PARSER_TRASH_BOX (pFakeStart, cxxTokenDestroy); - /* pFakeId may be destroyed via pParamInfo->aIdentifiers[i]. */ + PARSER_TRASH_BOX (pFakeId, cxxTokenDestroy); } if(cxxTokenTypeIs(t,CXXTokenTypeClosingParenthesis)) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 6809d3: Add option to show symbols in symbol tree without root groups
by Jiří Techet 21 Sep '22

21 Sep '22

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 13 Sep 2022 22:22:23 UTC Commit: 6809d3a8eabbe6b3ffe362c80cbbf29280e02bf7 https://github.com/geany/geany/commit/6809d3a8eabbe6b3ffe362c80cbbf29280e02… Log Message: ----------- Add option to show symbols in symbol tree without root groups While the current way of grouping symbols under various categories like "Functions", "Structures", "Macros" etc. may be useful in some situations, it doesn't allow true sorting by name or sorting by line number because this sorting is only valid within the group and not globally which makes it sometimes hard to find some symbol. This patch adds the option to switch between two views of the symbol tree by using a new checkbox called "Group by Type" to the context menu: - checked - the original view used by Geany - unchecked - view with a single root element "Symbols" in which all symbols are rooted and all of them either sorted by line number or alphabetically The core of the implementation is rather simple - there's always the "Symbols" root present at position 0 in tv_iters and when categorized view is selected, this root is used for all the tags. (We still need to keep the category roots in this situation to copy the icons for the tags from them but they are always empty and hidden). The rest is some UI stuff for creating entries in the context menu, I also added a config preference so this settings is remembered across Geany re-launches. I made this option global for all open files because I would find it annoying to apply this setting manually for every open file. So the code also checks whether the view type changed for the given file when switching tabs and re-creates the tree with the new setting. Modified Paths: -------------- doc/geany.txt src/document.c src/documentprivate.h src/keyfile.c src/symbols.c src/tagmanager/tm_parser.c src/ui_utils.h Modified: doc/geany.txt 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -264,6 +264,7 @@ described by that plugin documentation): * expand/collapse the tree * control sorting order + * control whether to group symbols by their type * locate the symbol in documents The symbols tab can also be filtered by typing a string into Modified: src/document.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -648,6 +648,7 @@ static GeanyDocument *document_create(const gchar *utf8_filename) /* initialize default document settings */ doc->priv = g_new0(GeanyDocumentPrivate, 1); doc->priv->tag_filter = g_strdup(""); + doc->priv->symbols_group_by_type = TRUE; doc->id = ++doc_id_counter; doc->index = new_idx; doc->file_name = g_strdup(utf8_filename); Modified: src/documentprivate.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -114,6 +114,8 @@ typedef struct GeanyDocumentPrivate GData *data; /* Text used for filtering symbol tree. */ gchar *tag_filter; + /* Group symbols in symbol tree by their type. */ + gboolean symbols_group_by_type; } GeanyDocumentPrivate; Modified: src/keyfile.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -606,6 +606,7 @@ static void save_ui_prefs(GKeyFile *config) g_key_file_set_boolean(config, PACKAGE, "statusbar_visible", interface_prefs.statusbar_visible); g_key_file_set_boolean(config, PACKAGE, "msgwindow_visible", ui_prefs.msgwindow_visible); g_key_file_set_boolean(config, PACKAGE, "fullscreen", ui_prefs.fullscreen); + g_key_file_set_boolean(config, PACKAGE, "symbols_group_by_type", ui_prefs.symbols_group_by_type); g_key_file_set_string(config, PACKAGE, "color_picker_palette", ui_prefs.color_picker_palette); /* get the text from the scribble textview */ @@ -1032,6 +1033,7 @@ static void load_ui_prefs(GKeyFile *config) ui_prefs.sidebar_visible = utils_get_setting_boolean(config, PACKAGE, "sidebar_visible", TRUE); ui_prefs.msgwindow_visible = utils_get_setting_boolean(config, PACKAGE, "msgwindow_visible", TRUE); ui_prefs.fullscreen = utils_get_setting_boolean(config, PACKAGE, "fullscreen", FALSE); + ui_prefs.symbols_group_by_type = utils_get_setting_boolean(config, PACKAGE, "symbols_group_by_type", TRUE); ui_prefs.custom_date_format = utils_get_setting_string(config, PACKAGE, "custom_date_format", ""); ui_prefs.custom_commands = g_key_file_get_string_list(config, PACKAGE, "custom_commands", NULL, NULL); ui_prefs.custom_commands_labels = g_key_file_get_string_list(config, PACKAGE, "custom_commands_labels", NULL, NULL); Modified: src/symbols.c 40 lines changed, 36 insertions(+), 4 deletions(-) =================================================================== @@ -100,6 +100,7 @@ static struct GtkWidget *find_usage; GtkWidget *find_doc_usage; GtkWidget *find_in_files; + GtkWidget *group_by_type; } symbol_menu; @@ -975,16 +976,18 @@ static void update_tree_tags(GeanyDocument *doc, GList **tags) foreach_list (item, *tags) { TMTag *tag = item->data; - GtkTreeIter *parent; + GtkTreeIter *parent, *parent_group; - parent = get_tag_type_iter(tag->lang, tag->type); - if (parent) + parent_group = get_tag_type_iter(tag->lang, tag->type); + /* tv_iters[0] is reserved for the "Symbols" group */ + parent = ui_prefs.symbols_group_by_type ? parent_group : &tv_iters[0]; + if (parent_group) { gboolean expand; const gchar *name; const gchar *parent_name; gchar *tooltip; - GdkPixbuf *icon = get_child_icon(store, parent); + GdkPixbuf *icon = get_child_icon(store, parent_group); parent_name = get_parent_name(tag); if (parent_name) @@ -1137,6 +1140,11 @@ gboolean symbols_recreate_tag_list(GeanyDocument *doc, gint sort_mode) if (tags == NULL) return FALSE; + if (doc->priv->symbols_group_by_type != ui_prefs.symbols_group_by_type) + gtk_tree_store_clear(doc->priv->tag_store); + + doc->priv->symbols_group_by_type = ui_prefs.symbols_group_by_type; + /* FIXME: Not sure why we detached the model here? */ /* disable sorting during update because the code doesn't support correctly @@ -2035,6 +2043,17 @@ static void on_symbol_tree_sort_clicked(GtkMenuItem *menuitem, gpointer user_dat doc->has_tags = symbols_recreate_tag_list(doc, sort_mode); } +static void on_symbol_tree_group_by_type_clicked(GtkMenuItem *menuitem, gpointer user_data) +{ + GeanyDocument *doc = document_get_current(); + + if (ignore_callback) + return; + + ui_prefs.symbols_group_by_type = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem)); + if (doc != NULL) + doc->has_tags = symbols_recreate_tag_list(doc, SYMBOLS_SORT_USE_PREVIOUS); +} static void on_symbol_tree_menu_show(GtkWidget *widget, gpointer user_data) @@ -2045,6 +2064,7 @@ static void on_symbol_tree_menu_show(GtkWidget *widget, enable = doc && doc->has_tags; gtk_widget_set_sensitive(symbol_menu.sort_by_name, enable); gtk_widget_set_sensitive(symbol_menu.sort_by_appearance, enable); + gtk_widget_set_sensitive(symbol_menu.group_by_type, enable); gtk_widget_set_sensitive(symbol_menu.expand_all, enable); gtk_widget_set_sensitive(symbol_menu.collapse_all, enable); gtk_widget_set_sensitive(symbol_menu.find_usage, enable); @@ -2060,6 +2080,9 @@ static void on_symbol_tree_menu_show(GtkWidget *widget, else gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(symbol_menu.sort_by_appearance), TRUE); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(symbol_menu.group_by_type), + ui_prefs.symbols_group_by_type); + ignore_callback = FALSE; } @@ -2147,6 +2170,15 @@ static void create_taglist_popup_menu(void) gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); + symbol_menu.group_by_type = item = gtk_check_menu_item_new_with_mnemonic(_("_Group by Type")); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect(item, "activate", G_CALLBACK(on_symbol_tree_group_by_type_clicked), NULL); + + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + symbol_menu.find_usage = item = ui_image_menu_item_new(GTK_STOCK_FIND, _("Find _Usage")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); Modified: src/tagmanager/tm_parser.c 26 lines changed, 18 insertions(+), 8 deletions(-) =================================================================== @@ -1057,30 +1057,40 @@ gint tm_parser_get_sidebar_group(TMParserType lang, TMTagType type) for (i = 0; i < map->group_num; i++) { if (map->groups[i].types & type) - return i; + return i + 1; // "Symbols" group is always first } return -1; } const gchar *tm_parser_get_sidebar_info(TMParserType lang, gint group, guint *icon) { + const gchar *name; TMParserMap *map; TMParserMapGroup *grp; if (lang >= TM_PARSER_COUNT) return NULL; - map = &parser_map[lang]; - if (group >= (gint)map->group_num) - return NULL; + if (group == 0) + { + name = _("Symbols"); + *icon = TM_ICON_NAMESPACE; + } + else + { + map = &parser_map[lang]; + if (group > (gint)map->group_num) + return NULL; - grp = &map->groups[group]; - *icon = grp->icon; + grp = &map->groups[group - 1]; + name = grp->name; + *icon = grp->icon; + } #ifdef GETTEXT_PACKAGE - return g_dgettext(GETTEXT_PACKAGE, grp->name); + return g_dgettext(GETTEXT_PACKAGE, name); #else - return grp->name; + return name; #endif } Modified: src/ui_utils.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -167,6 +167,7 @@ typedef struct UIPrefs gboolean allow_always_save; /* if set, files can always be saved, even if unchanged */ gchar *statusbar_template; gboolean new_document_after_close; + gboolean symbols_group_by_type; /* Menu-item related data */ GQueue *recent_queue; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 0bc92b: Merge pull request #3172 from techee/flat_tree
by Jiří Techet 21 Sep '22

21 Sep '22

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Wed, 21 Sep 2022 21:32:58 UTC Commit: 0bc92b0f54423f376f49fb5dcbd8dcfa5c30d618 https://github.com/geany/geany/commit/0bc92b0f54423f376f49fb5dcbd8dcfa5c30d… Log Message: ----------- Merge pull request #3172 from techee/flat_tree Add option to show symbols in symbol tree without root groups Modified Paths: -------------- doc/geany.txt src/document.c src/documentprivate.h src/keyfile.c src/symbols.c src/tagmanager/tm_parser.c src/ui_utils.h Modified: doc/geany.txt 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -264,6 +264,7 @@ described by that plugin documentation): * expand/collapse the tree * control sorting order + * control whether to group symbols by their type * locate the symbol in documents The symbols tab can also be filtered by typing a string into Modified: src/document.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -648,6 +648,7 @@ static GeanyDocument *document_create(const gchar *utf8_filename) /* initialize default document settings */ doc->priv = g_new0(GeanyDocumentPrivate, 1); doc->priv->tag_filter = g_strdup(""); + doc->priv->symbols_group_by_type = TRUE; doc->id = ++doc_id_counter; doc->index = new_idx; doc->file_name = g_strdup(utf8_filename); Modified: src/documentprivate.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -114,6 +114,8 @@ typedef struct GeanyDocumentPrivate GData *data; /* Text used for filtering symbol tree. */ gchar *tag_filter; + /* Group symbols in symbol tree by their type. */ + gboolean symbols_group_by_type; } GeanyDocumentPrivate; Modified: src/keyfile.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -653,6 +653,7 @@ static void save_ui_prefs(GKeyFile *config) g_key_file_set_boolean(config, PACKAGE, "statusbar_visible", interface_prefs.statusbar_visible); g_key_file_set_boolean(config, PACKAGE, "msgwindow_visible", ui_prefs.msgwindow_visible); g_key_file_set_boolean(config, PACKAGE, "fullscreen", ui_prefs.fullscreen); + g_key_file_set_boolean(config, PACKAGE, "symbols_group_by_type", ui_prefs.symbols_group_by_type); g_key_file_set_string(config, PACKAGE, "color_picker_palette", ui_prefs.color_picker_palette); /* get the text from the scribble textview */ @@ -1083,6 +1084,7 @@ static void load_ui_prefs(GKeyFile *config) ui_prefs.sidebar_visible = utils_get_setting_boolean(config, PACKAGE, "sidebar_visible", TRUE); ui_prefs.msgwindow_visible = utils_get_setting_boolean(config, PACKAGE, "msgwindow_visible", TRUE); ui_prefs.fullscreen = utils_get_setting_boolean(config, PACKAGE, "fullscreen", FALSE); + ui_prefs.symbols_group_by_type = utils_get_setting_boolean(config, PACKAGE, "symbols_group_by_type", TRUE); ui_prefs.custom_date_format = utils_get_setting_string(config, PACKAGE, "custom_date_format", ""); ui_prefs.custom_commands = g_key_file_get_string_list(config, PACKAGE, "custom_commands", NULL, NULL); ui_prefs.custom_commands_labels = g_key_file_get_string_list(config, PACKAGE, "custom_commands_labels", NULL, NULL); Modified: src/symbols.c 40 lines changed, 36 insertions(+), 4 deletions(-) =================================================================== @@ -100,6 +100,7 @@ static struct GtkWidget *find_usage; GtkWidget *find_doc_usage; GtkWidget *find_in_files; + GtkWidget *group_by_type; } symbol_menu; @@ -975,16 +976,18 @@ static void update_tree_tags(GeanyDocument *doc, GList **tags) foreach_list (item, *tags) { TMTag *tag = item->data; - GtkTreeIter *parent; + GtkTreeIter *parent, *parent_group; - parent = get_tag_type_iter(tag->lang, tag->type); - if (parent) + parent_group = get_tag_type_iter(tag->lang, tag->type); + /* tv_iters[0] is reserved for the "Symbols" group */ + parent = ui_prefs.symbols_group_by_type ? parent_group : &tv_iters[0]; + if (parent_group) { gboolean expand; const gchar *name; const gchar *parent_name; gchar *tooltip; - GdkPixbuf *icon = get_child_icon(store, parent); + GdkPixbuf *icon = get_child_icon(store, parent_group); parent_name = get_parent_name(tag); if (parent_name) @@ -1137,6 +1140,11 @@ gboolean symbols_recreate_tag_list(GeanyDocument *doc, gint sort_mode) if (tags == NULL) return FALSE; + if (doc->priv->symbols_group_by_type != ui_prefs.symbols_group_by_type) + gtk_tree_store_clear(doc->priv->tag_store); + + doc->priv->symbols_group_by_type = ui_prefs.symbols_group_by_type; + /* FIXME: Not sure why we detached the model here? */ /* disable sorting during update because the code doesn't support correctly @@ -2053,6 +2061,17 @@ static void on_symbol_tree_sort_clicked(GtkMenuItem *menuitem, gpointer user_dat doc->has_tags = symbols_recreate_tag_list(doc, sort_mode); } +static void on_symbol_tree_group_by_type_clicked(GtkMenuItem *menuitem, gpointer user_data) +{ + GeanyDocument *doc = document_get_current(); + + if (ignore_callback) + return; + + ui_prefs.symbols_group_by_type = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem)); + if (doc != NULL) + doc->has_tags = symbols_recreate_tag_list(doc, SYMBOLS_SORT_USE_PREVIOUS); +} static void on_symbol_tree_menu_show(GtkWidget *widget, gpointer user_data) @@ -2063,6 +2082,7 @@ static void on_symbol_tree_menu_show(GtkWidget *widget, enable = doc && doc->has_tags; gtk_widget_set_sensitive(symbol_menu.sort_by_name, enable); gtk_widget_set_sensitive(symbol_menu.sort_by_appearance, enable); + gtk_widget_set_sensitive(symbol_menu.group_by_type, enable); gtk_widget_set_sensitive(symbol_menu.expand_all, enable); gtk_widget_set_sensitive(symbol_menu.collapse_all, enable); gtk_widget_set_sensitive(symbol_menu.find_usage, enable); @@ -2078,6 +2098,9 @@ static void on_symbol_tree_menu_show(GtkWidget *widget, else gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(symbol_menu.sort_by_appearance), TRUE); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(symbol_menu.group_by_type), + ui_prefs.symbols_group_by_type); + ignore_callback = FALSE; } @@ -2165,6 +2188,15 @@ static void create_taglist_popup_menu(void) gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); + symbol_menu.group_by_type = item = gtk_check_menu_item_new_with_mnemonic(_("_Group by Type")); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect(item, "activate", G_CALLBACK(on_symbol_tree_group_by_type_clicked), NULL); + + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + symbol_menu.find_usage = item = ui_image_menu_item_new(GTK_STOCK_FIND, _("Find _Usage")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); Modified: src/tagmanager/tm_parser.c 26 lines changed, 18 insertions(+), 8 deletions(-) =================================================================== @@ -1186,30 +1186,40 @@ gint tm_parser_get_sidebar_group(TMParserType lang, TMTagType type) for (i = 0; i < map->group_num; i++) { if (map->groups[i].types & type) - return i; + return i + 1; // "Symbols" group is always first } return -1; } const gchar *tm_parser_get_sidebar_info(TMParserType lang, gint group, guint *icon) { + const gchar *name; TMParserMap *map; TMParserMapGroup *grp; if (lang >= TM_PARSER_COUNT) return NULL; - map = &parser_map[lang]; - if (group >= (gint)map->group_num) - return NULL; + if (group == 0) + { + name = _("Symbols"); + *icon = TM_ICON_NAMESPACE; + } + else + { + map = &parser_map[lang]; + if (group > (gint)map->group_num) + return NULL; - grp = &map->groups[group]; - *icon = grp->icon; + grp = &map->groups[group - 1]; + name = grp->name; + *icon = grp->icon; + } #ifdef GETTEXT_PACKAGE - return g_dgettext(GETTEXT_PACKAGE, grp->name); + return g_dgettext(GETTEXT_PACKAGE, name); #else - return grp->name; + return name; #endif } Modified: src/ui_utils.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -168,6 +168,7 @@ typedef struct UIPrefs gboolean allow_always_save; /* if set, files can always be saved, even if unchanged */ gchar *statusbar_template; gboolean new_document_after_close; + gboolean symbols_group_by_type; /* Menu-item related data */ GQueue *recent_queue; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 06e8bd: Enable local variable and parameter tag reporting for various languages
by Jiří Techet 21 Sep '22

21 Sep '22

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Fri, 02 Sep 2022 22:08:51 UTC Commit: 06e8bdc1b3cd516a068c43bd68b76a498e1adeee https://github.com/geany/geany/commit/06e8bdc1b3cd516a068c43bd68b76a498e1ad… Log Message: ----------- Enable local variable and parameter tag reporting for various languages This patch enables local variable and function parameter reporting for Python, GDScript, PHP, and Typescript. Because these are dynamic languages and Geany scope autocompletion relies on static type information, scope completion doesn't work for these languages. However, at least we get non-scope autocompletion for local variables and function parameters. Local variables in GDScript were previously mapped to tm_tag_other_t and were displayed in the sidebar. We don't display these tags for C/C++ in the sidebar and they should also be mapped to tm_tag_local_var_t which is why there is a diff in unit tests removing these variables from the output. The python parser generates a slightly different output when function parameter parsing is enabled (whitespace only change) which causes the change of the output of some python unit tests. Modified Paths: -------------- src/tagmanager/tm_parser.c tests/ctags/cython_sample.pyx.tags tests/ctags/gdscript-inner-class.gd.tags tests/ctags/gdscript-modifiers.gd.tags tests/ctags/gdscript-no-implicit-class.gd.tags tests/ctags/simple.py.tags Modified: src/tagmanager/tm_parser.c 23 lines changed, 11 insertions(+), 12 deletions(-) =================================================================== @@ -166,7 +166,7 @@ static TMParserMapEntry map_PHP[] = { {'d', tm_tag_macro_t}, // define {'f', tm_tag_function_t}, // function {'i', tm_tag_interface_t}, // interface - {'l', tm_tag_undef_t}, // local + {'l', tm_tag_local_var_t}, // local {'n', tm_tag_namespace_t}, // namespace {'t', tm_tag_struct_t}, // trait {'v', tm_tag_variable_t}, // variable @@ -178,7 +178,7 @@ static TMParserMapGroup group_PHP[] = { {_("Classes"), TM_ICON_CLASS, tm_tag_class_t}, {_("Functions"), TM_ICON_METHOD, tm_tag_function_t}, {_("Constants"), TM_ICON_MACRO, tm_tag_macro_t}, - {_("Variables"), TM_ICON_VAR, tm_tag_variable_t}, + {_("Variables"), TM_ICON_VAR, tm_tag_variable_t | tm_tag_local_var_t}, {_("Traits"), TM_ICON_STRUCT, tm_tag_struct_t}, }; @@ -192,14 +192,14 @@ static TMParserMapEntry map_PYTHON[] = { /* defined as externvar to get those excluded as forward type in symbols.c:goto_tag() * so we can jump to the real implementation (if known) instead of to the import statement */ {'x', tm_tag_externvar_t}, // unknown - {'z', tm_tag_undef_t}, // parameter - {'l', tm_tag_undef_t}, // local + {'z', tm_tag_local_var_t}, // parameter + {'l', tm_tag_local_var_t}, // local }; static TMParserMapGroup group_PYTHON[] = { {_("Classes"), TM_ICON_CLASS, tm_tag_class_t}, {_("Methods"), TM_ICON_MACRO, tm_tag_method_t}, {_("Functions"), TM_ICON_METHOD, tm_tag_function_t}, - {_("Variables"), TM_ICON_VAR, tm_tag_variable_t}, + {_("Variables"), TM_ICON_VAR, tm_tag_variable_t | tm_tag_local_var_t}, {_("Imports"), TM_ICON_NAMESPACE, tm_tag_externvar_t}, }; @@ -969,16 +969,15 @@ static TMParserMapEntry map_GDSCRIPT[] = { {'C', tm_tag_variable_t}, // const {'g', tm_tag_enum_t}, // enum {'e', tm_tag_variable_t}, // enumerator - {'z', tm_tag_other_t}, // parameter - {'l', tm_tag_other_t}, // local + {'z', tm_tag_local_var_t}, // parameter + {'l', tm_tag_local_var_t}, // local {'s', tm_tag_variable_t}, // signal }; static TMParserMapGroup group_GDSCRIPT[] = { {_("Classes"), TM_ICON_CLASS, tm_tag_class_t}, {_("Methods"), TM_ICON_MACRO, tm_tag_method_t}, - {_("Variables"), TM_ICON_VAR, tm_tag_variable_t}, + {_("Variables"), TM_ICON_VAR, tm_tag_variable_t | tm_tag_local_var_t}, {_("Enums"), TM_ICON_STRUCT, tm_tag_enum_t}, - {_("Other"), TM_ICON_OTHER, tm_tag_other_t}, }; static TMParserMapEntry map_CLOJURE[] = { @@ -1012,10 +1011,10 @@ static TMParserMapEntry map_TYPESCRIPT[] = { {'e', tm_tag_enumerator_t}, // enumerator {'m', tm_tag_method_t}, // method {'n', tm_tag_namespace_t}, // namespace - {'z', tm_tag_undef_t}, // parameter + {'z', tm_tag_local_var_t}, // parameter {'p', tm_tag_member_t}, // property {'v', tm_tag_variable_t}, // variable - {'l', tm_tag_undef_t}, // local + {'l', tm_tag_local_var_t}, // local {'C', tm_tag_macro_t}, // constant {'G', tm_tag_undef_t}, // generator {'a', tm_tag_undef_t}, // alias @@ -1026,7 +1025,7 @@ static TMParserMapGroup group_TYPESCRIPT[] = { {_("Interfaces"), TM_ICON_STRUCT, tm_tag_interface_t}, {_("Functions"), TM_ICON_METHOD, tm_tag_function_t | tm_tag_method_t}, {_("Enums"), TM_ICON_STRUCT, tm_tag_enum_t}, - {_("Variables"), TM_ICON_VAR, tm_tag_variable_t}, + {_("Variables"), TM_ICON_VAR, tm_tag_variable_t | tm_tag_local_var_t}, {_("Constants"), TM_ICON_MACRO, tm_tag_macro_t}, {_("Other"), TM_ICON_MEMBER, tm_tag_member_t | tm_tag_enumerator_t}, }; Modified: tests/ctags/cython_sample.pyx.tags 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -4,8 +4,8 @@ StdClass class: StdClass __init__�128�(self)�CDefClass�0 method: CDefClass :: __init__(self) -c_method�128�(self,int i)�CDefClass�0 -method: CDefClass :: c_method(self,int i) +c_method�128�(self, int i)�CDefClass�0 +method: CDefClass :: c_method(self, int i) identity�16�(x)�0 function: identity(x) int2string�16�(int i)�0 Modified: tests/ctags/gdscript-inner-class.gd.tags 20 lines changed, 0 insertions(+), 20 deletions(-) =================================================================== @@ -22,14 +22,10 @@ _init method: Peer :: _init(peer_id) center�16384�Circle2D�0 variable: Circle2D :: center -close�524288�Lobby.leave�0 -other: Lobby.leave :: close color�16384�Circle2D�0 variable: Circle2D :: color host�16384�Lobby�0�int variable: int Lobby :: host -host_id�524288�Lobby._init�0�int -other: int Lobby._init :: host_id id�16384�Peer�0 variable: Peer :: id join�128�(peer_id, server)�Lobby�0�bool @@ -40,16 +36,6 @@ lobbies variable: Dictionary lobbies lobby�16384�Peer�0 variable: Peer :: lobby -new_peer�524288�Lobby.join�0�WebSocketPeer -other: WebSocketPeer Lobby.join :: new_peer -peer_id�524288�Lobby.join�0 -other: Lobby.join :: peer_id -peer_id�524288�Lobby.leave�0 -other: Lobby.leave :: peer_id -peer_id�524288�Lobby.seal�0 -other: Lobby.seal :: peer_id -peer_id�524288�Peer._init�0 -other: Peer._init :: peer_id peers�16384�0�Dictionary variable: Dictionary peers peers�16384�Lobby�0�Array @@ -64,12 +50,6 @@ sealed variable: bool Lobby :: sealed server�16384�0�WebSocketServer variable: WebSocketServer server -server�524288�Lobby.join�0 -other: Lobby.join :: server -server�524288�Lobby.leave�0 -other: Lobby.leave :: server -server�524288�Lobby.seal�0 -other: Lobby.seal :: server time�16384�Lobby�0 variable: Lobby :: time time�16384�Peer�0 Modified: tests/ctags/gdscript-modifiers.gd.tags 16 lines changed, 0 insertions(+), 16 deletions(-) =================================================================== @@ -1,26 +1,10 @@ _create_block_collider�128�(block_sub_position)�0 method: _create_block_collider(block_sub_position) -a�524288�id�0 -other: id :: a -b�524288�r�0 -other: r :: b -block_id�524288�calculate_block_uvs�0 -other: calculate_block_uvs :: block_id -block_sub_position�524288�_create_block_collider�0 -other: _create_block_collider :: block_sub_position -c�524288�x�0 -other: x :: c calculate_block_uvs�128�(block_id)�0 method: calculate_block_uvs(block_id) -col�524288�calculate_block_uvs�0 -other: calculate_block_uvs :: col -collider�524288�_create_block_collider�0 -other: _create_block_collider :: collider id�128�(a)�0 method: id(a) r�128�(b)�0 method: r(b) -row�524288�calculate_block_uvs�0 -other: calculate_block_uvs :: row x�128�(c)�0 method: x(c) Modified: tests/ctags/gdscript-no-implicit-class.gd.tags 14 lines changed, 0 insertions(+), 14 deletions(-) =================================================================== @@ -38,20 +38,6 @@ foooooooo method: String Something :: foooooooo() inferred_type�16384�0 variable: inferred_type -local_var�524288�some_function�0 -other: some_function :: local_var -local_var2�524288�some_function�0 -other: some_function :: local_var2 -lv�524288�_init�0 -other: _init :: lv -p1�524288�something�0 -other: something :: p1 -p2�524288�something�0 -other: something :: p2 -param1�524288�some_function�0�Vector3 -other: Vector3 some_function :: param1 -param2�524288�some_function�0�int -other: int some_function :: param2 s�16384�0 variable: s sig�16384�0 Modified: tests/ctags/simple.py.tags 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -26,8 +26,8 @@ deeply_nested class: _test.ignored_function.more_nesting :: deeply_nested even_more�128�()�_test.ignored_function.more_nesting.deeply_nested�0 method: _test.ignored_function.more_nesting.deeply_nested :: even_more() -foo�16�( x , y, z)�0 -function: foo( x , y, z) +foo�16�( x, y, z)�0 +function: foo( x, y, z) ignored_function�16�()�_test�0 function: _test :: ignored_function() more_nesting�16�()�_test.ignored_function�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 41b401: Update python parser to the latest version from uctags
by Jiří Techet 21 Sep '22

21 Sep '22

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Fri, 02 Sep 2022 22:07:37 UTC Commit: 41b40120eaf3c1fcb46f9156de3585d3eaf2ec87 https://github.com/geany/geany/commit/41b40120eaf3c1fcb46f9156de3585d3eaf2e… Log Message: ----------- Update python parser to the latest version from uctags This version contains fixes related to parsing function parameters. Modified Paths: -------------- ctags/parsers/python.c Modified: ctags/parsers/python.c 258 lines changed, 206 insertions(+), 52 deletions(-) =================================================================== @@ -23,6 +23,7 @@ #include "debug.h" #include "xtag.h" #include "objpool.h" +#include "ptrarray.h" #define isIdentifierChar(c) \ (isalnum (c) || (c) == '_' || (c) >= 0x80) @@ -935,15 +936,204 @@ static vString *parseReturnTypeAnnotation (tokenInfo *const token) return NULL; } +struct typedParam { + tokenInfo *token; + vString *type; +}; + +static struct typedParam *makeTypedParam (tokenInfo *token, vString *type) +{ + struct typedParam *p = xMalloc (1, struct typedParam); + p->token = token; + p->type = type; + return p; +} + +static struct typedParam *makeTypedParamWithCopy (const tokenInfo *token, const vString *type) +{ + tokenInfo *token_copied = newToken (); + copyToken (token_copied, token); + + + vString *type_copied = type? vStringNewCopy (type): NULL; + return makeTypedParam (token_copied, type_copied); +} + +static void deleteTypedParam (struct typedParam *p) +{ + deleteToken (p->token); + vStringDelete (p->type); /* NULL is acceptable. */ + eFree (p); +} + +static void parseArglist (tokenInfo *const token, const int kind, + vString *const arglist, ptrArray *const parameters) +{ + int prevTokenType = token->type; + int depth = 1; + + if (kind != K_CLASS) + reprCat (arglist, token); + + do + { + if (token->type != TOKEN_WHITESPACE && + /* for easy `*args` and `**kwargs` support, we also ignore + * `*`, which anyway can't otherwise screw us up */ + token->type != '*') + { + prevTokenType = token->type; + } + + readTokenFull (token, true); + if (kind != K_CLASS || token->type != ')' || depth > 1) + reprCat (arglist, token); + + if (token->type == '(' || + token->type == '[' || + token->type == '{') + depth ++; + else if (token->type == ')' || + token->type == ']' || + token->type == '}') + depth --; + else if (kind != K_CLASS && depth == 1 && + token->type == TOKEN_IDENTIFIER && + (prevTokenType == '(' || prevTokenType == ',') && + PythonKinds[K_PARAMETER].enabled) + { + tokenInfo *parameterName; + vString *parameterType; + struct typedParam *parameter; + + parameterName = newToken (); + copyToken (parameterName, token); + parameterType = parseParamTypeAnnotation (token, arglist); + + parameter = makeTypedParam (parameterName, parameterType); + ptrArrayAdd (parameters, parameter); + } + } + while (token->type != TOKEN_EOF && depth > 0); +} + +static void parseCArglist (tokenInfo *const token, const int kind, + vString *const arglist, ptrArray *const parameters) +{ + int depth = 1; + tokenInfo *pname = newToken (); + vString *ptype = vStringNew (); + vStringCat (arglist, token->string); /* '(' */ + + while (true) + { + readToken (token); + if (token->type == TOKEN_EOF) + { + /* Unexpected input. */ + vStringClear (arglist); + ptrArrayClear (parameters); + break; + } + + if (depth == 1 && (token->type == ',' || token->type == ')')) + { + if (pname->type == TOKEN_IDENTIFIER) + { + struct typedParam *p; + + /* + * Clean up the type string. + * The type string includes the parameter name at the end. + * 1. Trim the parameter name at the end. + * 2. Then, trim the white space at the end of the type string. + * 3. If the type string is not empty, + * 3.a append (the type stirng + ' ' + the parameter name) to arglist. + * 3.b else just append the parameter name to arglist. + * + * FIXME: + * This doesn't work well with an array and a function pointer. + * + * f(..., int seq [dim], ...) + * in this case, dim is extacted as a parameter. + * + * f(..., int (*fn)(int), ...) + * in this case , int is extacted as a parameter. + */ + Assert (vStringLength (ptype) >= vStringLength (pname->string)); + size_t ptype_len = vStringLength (ptype) - vStringLength (pname->string); + vStringTruncate (ptype, ptype_len); + + if (vStringLength (ptype) > 0) + { + vStringStripTrailing (ptype); + if (vStringLength (ptype) > 0) + { + vStringCat (arglist, ptype); + vStringPut (arglist, ' '); + } + } + vStringCat (arglist, pname->string); + + p = makeTypedParamWithCopy (pname, vStringIsEmpty(ptype)? NULL: ptype); + ptrArrayAdd (parameters, p); + } + if (token->type == ')') + { + vStringPut (arglist, ')'); + break; + } + vStringCatS (arglist, ", "); + vStringClear (ptype); + pname->type = TOKEN_UNDEFINED; + continue; + } + + if (token->type == '(' || + token->type == '[' || + token->type == '{') + { + vStringPut (ptype, token->type); + depth ++; + continue; + } + + if (token->type == ')' || + token->type == ']' || + token->type == '}') + { + vStringPut (ptype, token->type); + depth --; + continue; + } + + if (token->type == TOKEN_IDENTIFIER || token->type == TOKEN_KEYWORD) + { + if (vStringLength (ptype) > 0 + && (isalnum ((unsigned char)vStringLast (ptype)) + || vStringLast (ptype) == ',')) + vStringPut (ptype, ' '); + vStringCat (ptype, token->string); + + if (!isdigit ((unsigned char)vStringLast (token->string))) + copyToken (pname, token); + continue; + } + + vStringCat (ptype, token->string); + } + + vStringDelete (ptype); + deleteToken (pname); +} + static bool parseClassOrDef (tokenInfo *const token, const vString *const decorators, pythonKind kind, bool isCDef) { vString *arglist = NULL; tokenInfo *name = NULL; - tokenInfo *parameterTokens[16] = { NULL }; - vString *parameterTypes [ARRAY_SIZE(parameterTokens)] = { NULL }; - unsigned int parameterCount = 0; + ptrArray *parameters = NULL; NestingLevel *lv; int corkIndex; @@ -966,49 +1156,13 @@ static bool parseClassOrDef (tokenInfo *const token, /* collect parameters or inheritance */ if (token->type == '(') { - int prevTokenType = token->type; - int depth = 1; - arglist = vStringNew (); - if (kind != K_CLASS) - reprCat (arglist, token); - - do - { - if (token->type != TOKEN_WHITESPACE && - /* for easy `*args` and `**kwargs` support, we also ignore - * `*`, which anyway can't otherwise screw us up */ - token->type != '*') - { - prevTokenType = token->type; - } + parameters = ptrArrayNew ((ptrArrayDeleteFunc)deleteTypedParam); - readTokenFull (token, true); - if (kind != K_CLASS || token->type != ')' || depth > 1) - reprCat (arglist, token); - - if (token->type == '(' || - token->type == '[' || - token->type == '{') - depth ++; - else if (token->type == ')' || - token->type == ']' || - token->type == '}') - depth --; - else if (kind != K_CLASS && depth == 1 && - token->type == TOKEN_IDENTIFIER && - (prevTokenType == '(' || prevTokenType == ',') && - parameterCount < ARRAY_SIZE (parameterTokens) && - PythonKinds[K_PARAMETER].enabled) - { - tokenInfo *parameterName = newToken (); - - copyToken (parameterName, token); - parameterTokens[parameterCount] = parameterName; - parameterTypes [parameterCount++] = parseParamTypeAnnotation (token, arglist); - } - } - while (token->type != TOKEN_EOF && depth > 0); + if (isCDef && kind != K_CLASS) + parseCArglist (token, kind, arglist, parameters); + else + parseArglist (token, kind, arglist, parameters); } if (kind == K_CLASS) @@ -1022,24 +1176,24 @@ static bool parseClassOrDef (tokenInfo *const token, deleteToken (name); vStringDelete (arglist); - if (parameterCount > 0) + if (parameters && !ptrArrayIsEmpty (parameters)) { unsigned int i; - for (i = 0; i < parameterCount; i++) + for (i = 0; i < ptrArrayCount (parameters); i++) { - int paramCorkIndex = makeSimplePythonTag (parameterTokens[i], K_PARAMETER); - deleteToken (parameterTokens[i]); + struct typedParam *parameter = ptrArrayItem (parameters, i); + int paramCorkIndex = makeSimplePythonTag (parameter->token, K_PARAMETER); tagEntryInfo *e = getEntryInCorkQueue (paramCorkIndex); - if (e && parameterTypes[i]) + if (e && parameter->type) { e->extensionFields.typeRef [0] = eStrdup ("typename"); - e->extensionFields.typeRef [1] = vStringDeleteUnwrap (parameterTypes[i]); - parameterTypes[i] = NULL; + e->extensionFields.typeRef [1] = vStringDeleteUnwrap (parameter->type); + parameter->type = NULL; } - vStringDelete (parameterTypes[i]); /* NULL is acceptable. */ } } + ptrArrayDelete (parameters); /* NULL is acceptable. */ tagEntryInfo *e; vString *t; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 395218: Merge pull request #3275 from techee/local_python
by Jiří Techet 21 Sep '22

21 Sep '22

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Wed, 21 Sep 2022 21:32:25 UTC Commit: 3952182724b84c465f680e0a82e1333fefc94f64 https://github.com/geany/geany/commit/3952182724b84c465f680e0a82e1333fefc94… Log Message: ----------- Merge pull request #3275 from techee/local_python Enable local variable and parameter tag reporting for various languages Modified Paths: -------------- ctags/parsers/python.c src/tagmanager/tm_parser.c tests/ctags/cython_sample.pyx.tags tests/ctags/gdscript-inner-class.gd.tags tests/ctags/gdscript-modifiers.gd.tags tests/ctags/gdscript-no-implicit-class.gd.tags tests/ctags/simple.py.tags Modified: ctags/parsers/python.c 258 lines changed, 206 insertions(+), 52 deletions(-) =================================================================== @@ -23,6 +23,7 @@ #include "debug.h" #include "xtag.h" #include "objpool.h" +#include "ptrarray.h" #define isIdentifierChar(c) \ (isalnum (c) || (c) == '_' || (c) >= 0x80) @@ -935,15 +936,204 @@ static vString *parseReturnTypeAnnotation (tokenInfo *const token) return NULL; } +struct typedParam { + tokenInfo *token; + vString *type; +}; + +static struct typedParam *makeTypedParam (tokenInfo *token, vString *type) +{ + struct typedParam *p = xMalloc (1, struct typedParam); + p->token = token; + p->type = type; + return p; +} + +static struct typedParam *makeTypedParamWithCopy (const tokenInfo *token, const vString *type) +{ + tokenInfo *token_copied = newToken (); + copyToken (token_copied, token); + + + vString *type_copied = type? vStringNewCopy (type): NULL; + return makeTypedParam (token_copied, type_copied); +} + +static void deleteTypedParam (struct typedParam *p) +{ + deleteToken (p->token); + vStringDelete (p->type); /* NULL is acceptable. */ + eFree (p); +} + +static void parseArglist (tokenInfo *const token, const int kind, + vString *const arglist, ptrArray *const parameters) +{ + int prevTokenType = token->type; + int depth = 1; + + if (kind != K_CLASS) + reprCat (arglist, token); + + do + { + if (token->type != TOKEN_WHITESPACE && + /* for easy `*args` and `**kwargs` support, we also ignore + * `*`, which anyway can't otherwise screw us up */ + token->type != '*') + { + prevTokenType = token->type; + } + + readTokenFull (token, true); + if (kind != K_CLASS || token->type != ')' || depth > 1) + reprCat (arglist, token); + + if (token->type == '(' || + token->type == '[' || + token->type == '{') + depth ++; + else if (token->type == ')' || + token->type == ']' || + token->type == '}') + depth --; + else if (kind != K_CLASS && depth == 1 && + token->type == TOKEN_IDENTIFIER && + (prevTokenType == '(' || prevTokenType == ',') && + PythonKinds[K_PARAMETER].enabled) + { + tokenInfo *parameterName; + vString *parameterType; + struct typedParam *parameter; + + parameterName = newToken (); + copyToken (parameterName, token); + parameterType = parseParamTypeAnnotation (token, arglist); + + parameter = makeTypedParam (parameterName, parameterType); + ptrArrayAdd (parameters, parameter); + } + } + while (token->type != TOKEN_EOF && depth > 0); +} + +static void parseCArglist (tokenInfo *const token, const int kind, + vString *const arglist, ptrArray *const parameters) +{ + int depth = 1; + tokenInfo *pname = newToken (); + vString *ptype = vStringNew (); + vStringCat (arglist, token->string); /* '(' */ + + while (true) + { + readToken (token); + if (token->type == TOKEN_EOF) + { + /* Unexpected input. */ + vStringClear (arglist); + ptrArrayClear (parameters); + break; + } + + if (depth == 1 && (token->type == ',' || token->type == ')')) + { + if (pname->type == TOKEN_IDENTIFIER) + { + struct typedParam *p; + + /* + * Clean up the type string. + * The type string includes the parameter name at the end. + * 1. Trim the parameter name at the end. + * 2. Then, trim the white space at the end of the type string. + * 3. If the type string is not empty, + * 3.a append (the type stirng + ' ' + the parameter name) to arglist. + * 3.b else just append the parameter name to arglist. + * + * FIXME: + * This doesn't work well with an array and a function pointer. + * + * f(..., int seq [dim], ...) + * in this case, dim is extacted as a parameter. + * + * f(..., int (*fn)(int), ...) + * in this case , int is extacted as a parameter. + */ + Assert (vStringLength (ptype) >= vStringLength (pname->string)); + size_t ptype_len = vStringLength (ptype) - vStringLength (pname->string); + vStringTruncate (ptype, ptype_len); + + if (vStringLength (ptype) > 0) + { + vStringStripTrailing (ptype); + if (vStringLength (ptype) > 0) + { + vStringCat (arglist, ptype); + vStringPut (arglist, ' '); + } + } + vStringCat (arglist, pname->string); + + p = makeTypedParamWithCopy (pname, vStringIsEmpty(ptype)? NULL: ptype); + ptrArrayAdd (parameters, p); + } + if (token->type == ')') + { + vStringPut (arglist, ')'); + break; + } + vStringCatS (arglist, ", "); + vStringClear (ptype); + pname->type = TOKEN_UNDEFINED; + continue; + } + + if (token->type == '(' || + token->type == '[' || + token->type == '{') + { + vStringPut (ptype, token->type); + depth ++; + continue; + } + + if (token->type == ')' || + token->type == ']' || + token->type == '}') + { + vStringPut (ptype, token->type); + depth --; + continue; + } + + if (token->type == TOKEN_IDENTIFIER || token->type == TOKEN_KEYWORD) + { + if (vStringLength (ptype) > 0 + && (isalnum ((unsigned char)vStringLast (ptype)) + || vStringLast (ptype) == ',')) + vStringPut (ptype, ' '); + vStringCat (ptype, token->string); + + if (!isdigit ((unsigned char)vStringLast (token->string))) + copyToken (pname, token); + continue; + } + + vStringCat (ptype, token->string); + } + + vStringDelete (ptype); + deleteToken (pname); +} + static bool parseClassOrDef (tokenInfo *const token, const vString *const decorators, pythonKind kind, bool isCDef) { vString *arglist = NULL; tokenInfo *name = NULL; - tokenInfo *parameterTokens[16] = { NULL }; - vString *parameterTypes [ARRAY_SIZE(parameterTokens)] = { NULL }; - unsigned int parameterCount = 0; + ptrArray *parameters = NULL; NestingLevel *lv; int corkIndex; @@ -966,49 +1156,13 @@ static bool parseClassOrDef (tokenInfo *const token, /* collect parameters or inheritance */ if (token->type == '(') { - int prevTokenType = token->type; - int depth = 1; - arglist = vStringNew (); - if (kind != K_CLASS) - reprCat (arglist, token); - - do - { - if (token->type != TOKEN_WHITESPACE && - /* for easy `*args` and `**kwargs` support, we also ignore - * `*`, which anyway can't otherwise screw us up */ - token->type != '*') - { - prevTokenType = token->type; - } + parameters = ptrArrayNew ((ptrArrayDeleteFunc)deleteTypedParam); - readTokenFull (token, true); - if (kind != K_CLASS || token->type != ')' || depth > 1) - reprCat (arglist, token); - - if (token->type == '(' || - token->type == '[' || - token->type == '{') - depth ++; - else if (token->type == ')' || - token->type == ']' || - token->type == '}') - depth --; - else if (kind != K_CLASS && depth == 1 && - token->type == TOKEN_IDENTIFIER && - (prevTokenType == '(' || prevTokenType == ',') && - parameterCount < ARRAY_SIZE (parameterTokens) && - PythonKinds[K_PARAMETER].enabled) - { - tokenInfo *parameterName = newToken (); - - copyToken (parameterName, token); - parameterTokens[parameterCount] = parameterName; - parameterTypes [parameterCount++] = parseParamTypeAnnotation (token, arglist); - } - } - while (token->type != TOKEN_EOF && depth > 0); + if (isCDef && kind != K_CLASS) + parseCArglist (token, kind, arglist, parameters); + else + parseArglist (token, kind, arglist, parameters); } if (kind == K_CLASS) @@ -1022,24 +1176,24 @@ static bool parseClassOrDef (tokenInfo *const token, deleteToken (name); vStringDelete (arglist); - if (parameterCount > 0) + if (parameters && !ptrArrayIsEmpty (parameters)) { unsigned int i; - for (i = 0; i < parameterCount; i++) + for (i = 0; i < ptrArrayCount (parameters); i++) { - int paramCorkIndex = makeSimplePythonTag (parameterTokens[i], K_PARAMETER); - deleteToken (parameterTokens[i]); + struct typedParam *parameter = ptrArrayItem (parameters, i); + int paramCorkIndex = makeSimplePythonTag (parameter->token, K_PARAMETER); tagEntryInfo *e = getEntryInCorkQueue (paramCorkIndex); - if (e && parameterTypes[i]) + if (e && parameter->type) { e->extensionFields.typeRef [0] = eStrdup ("typename"); - e->extensionFields.typeRef [1] = vStringDeleteUnwrap (parameterTypes[i]); - parameterTypes[i] = NULL; + e->extensionFields.typeRef [1] = vStringDeleteUnwrap (parameter->type); + parameter->type = NULL; } - vStringDelete (parameterTypes[i]); /* NULL is acceptable. */ } } + ptrArrayDelete (parameters); /* NULL is acceptable. */ tagEntryInfo *e; vString *t; Modified: src/tagmanager/tm_parser.c 23 lines changed, 11 insertions(+), 12 deletions(-) =================================================================== @@ -166,7 +166,7 @@ static TMParserMapEntry map_PHP[] = { {'d', tm_tag_macro_t}, // define {'f', tm_tag_function_t}, // function {'i', tm_tag_interface_t}, // interface - {'l', tm_tag_undef_t}, // local + {'l', tm_tag_local_var_t}, // local {'n', tm_tag_namespace_t}, // namespace {'t', tm_tag_struct_t}, // trait {'v', tm_tag_variable_t}, // variable @@ -178,7 +178,7 @@ static TMParserMapGroup group_PHP[] = { {_("Classes"), TM_ICON_CLASS, tm_tag_class_t}, {_("Functions"), TM_ICON_METHOD, tm_tag_function_t}, {_("Constants"), TM_ICON_MACRO, tm_tag_macro_t}, - {_("Variables"), TM_ICON_VAR, tm_tag_variable_t}, + {_("Variables"), TM_ICON_VAR, tm_tag_variable_t | tm_tag_local_var_t}, {_("Traits"), TM_ICON_STRUCT, tm_tag_struct_t}, }; @@ -192,14 +192,14 @@ static TMParserMapEntry map_PYTHON[] = { /* defined as externvar to get those excluded as forward type in symbols.c:goto_tag() * so we can jump to the real implementation (if known) instead of to the import statement */ {'x', tm_tag_externvar_t}, // unknown - {'z', tm_tag_undef_t}, // parameter - {'l', tm_tag_undef_t}, // local + {'z', tm_tag_local_var_t}, // parameter + {'l', tm_tag_local_var_t}, // local }; static TMParserMapGroup group_PYTHON[] = { {_("Classes"), TM_ICON_CLASS, tm_tag_class_t}, {_("Methods"), TM_ICON_MACRO, tm_tag_method_t}, {_("Functions"), TM_ICON_METHOD, tm_tag_function_t}, - {_("Variables"), TM_ICON_VAR, tm_tag_variable_t}, + {_("Variables"), TM_ICON_VAR, tm_tag_variable_t | tm_tag_local_var_t}, {_("Imports"), TM_ICON_NAMESPACE, tm_tag_externvar_t}, }; @@ -969,16 +969,15 @@ static TMParserMapEntry map_GDSCRIPT[] = { {'C', tm_tag_variable_t}, // const {'g', tm_tag_enum_t}, // enum {'e', tm_tag_variable_t}, // enumerator - {'z', tm_tag_other_t}, // parameter - {'l', tm_tag_other_t}, // local + {'z', tm_tag_local_var_t}, // parameter + {'l', tm_tag_local_var_t}, // local {'s', tm_tag_variable_t}, // signal }; static TMParserMapGroup group_GDSCRIPT[] = { {_("Classes"), TM_ICON_CLASS, tm_tag_class_t}, {_("Methods"), TM_ICON_MACRO, tm_tag_method_t}, - {_("Variables"), TM_ICON_VAR, tm_tag_variable_t}, + {_("Variables"), TM_ICON_VAR, tm_tag_variable_t | tm_tag_local_var_t}, {_("Enums"), TM_ICON_STRUCT, tm_tag_enum_t}, - {_("Other"), TM_ICON_OTHER, tm_tag_other_t}, }; static TMParserMapEntry map_CLOJURE[] = { @@ -1012,10 +1011,10 @@ static TMParserMapEntry map_TYPESCRIPT[] = { {'e', tm_tag_enumerator_t}, // enumerator {'m', tm_tag_method_t}, // method {'n', tm_tag_namespace_t}, // namespace - {'z', tm_tag_undef_t}, // parameter + {'z', tm_tag_local_var_t}, // parameter {'p', tm_tag_member_t}, // property {'v', tm_tag_variable_t}, // variable - {'l', tm_tag_undef_t}, // local + {'l', tm_tag_local_var_t}, // local {'C', tm_tag_macro_t}, // constant {'G', tm_tag_undef_t}, // generator {'a', tm_tag_undef_t}, // alias @@ -1026,7 +1025,7 @@ static TMParserMapGroup group_TYPESCRIPT[] = { {_("Interfaces"), TM_ICON_STRUCT, tm_tag_interface_t}, {_("Functions"), TM_ICON_METHOD, tm_tag_function_t | tm_tag_method_t}, {_("Enums"), TM_ICON_STRUCT, tm_tag_enum_t}, - {_("Variables"), TM_ICON_VAR, tm_tag_variable_t}, + {_("Variables"), TM_ICON_VAR, tm_tag_variable_t | tm_tag_local_var_t}, {_("Constants"), TM_ICON_MACRO, tm_tag_macro_t}, {_("Other"), TM_ICON_MEMBER, tm_tag_member_t | tm_tag_enumerator_t}, }; Modified: tests/ctags/cython_sample.pyx.tags 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -4,8 +4,8 @@ StdClass class: StdClass __init__�128�(self)�CDefClass�0 method: CDefClass :: __init__(self) -c_method�128�(self,int i)�CDefClass�0 -method: CDefClass :: c_method(self,int i) +c_method�128�(self, int i)�CDefClass�0 +method: CDefClass :: c_method(self, int i) identity�16�(x)�0 function: identity(x) int2string�16�(int i)�0 Modified: tests/ctags/gdscript-inner-class.gd.tags 20 lines changed, 0 insertions(+), 20 deletions(-) =================================================================== @@ -22,14 +22,10 @@ _init method: Peer :: _init(peer_id) center�16384�Circle2D�0 variable: Circle2D :: center -close�524288�Lobby.leave�0 -other: Lobby.leave :: close color�16384�Circle2D�0 variable: Circle2D :: color host�16384�Lobby�0�int variable: int Lobby :: host -host_id�524288�Lobby._init�0�int -other: int Lobby._init :: host_id id�16384�Peer�0 variable: Peer :: id join�128�(peer_id, server)�Lobby�0�bool @@ -40,16 +36,6 @@ lobbies variable: Dictionary lobbies lobby�16384�Peer�0 variable: Peer :: lobby -new_peer�524288�Lobby.join�0�WebSocketPeer -other: WebSocketPeer Lobby.join :: new_peer -peer_id�524288�Lobby.join�0 -other: Lobby.join :: peer_id -peer_id�524288�Lobby.leave�0 -other: Lobby.leave :: peer_id -peer_id�524288�Lobby.seal�0 -other: Lobby.seal :: peer_id -peer_id�524288�Peer._init�0 -other: Peer._init :: peer_id peers�16384�0�Dictionary variable: Dictionary peers peers�16384�Lobby�0�Array @@ -64,12 +50,6 @@ sealed variable: bool Lobby :: sealed server�16384�0�WebSocketServer variable: WebSocketServer server -server�524288�Lobby.join�0 -other: Lobby.join :: server -server�524288�Lobby.leave�0 -other: Lobby.leave :: server -server�524288�Lobby.seal�0 -other: Lobby.seal :: server time�16384�Lobby�0 variable: Lobby :: time time�16384�Peer�0 Modified: tests/ctags/gdscript-modifiers.gd.tags 16 lines changed, 0 insertions(+), 16 deletions(-) =================================================================== @@ -1,26 +1,10 @@ _create_block_collider�128�(block_sub_position)�0 method: _create_block_collider(block_sub_position) -a�524288�id�0 -other: id :: a -b�524288�r�0 -other: r :: b -block_id�524288�calculate_block_uvs�0 -other: calculate_block_uvs :: block_id -block_sub_position�524288�_create_block_collider�0 -other: _create_block_collider :: block_sub_position -c�524288�x�0 -other: x :: c calculate_block_uvs�128�(block_id)�0 method: calculate_block_uvs(block_id) -col�524288�calculate_block_uvs�0 -other: calculate_block_uvs :: col -collider�524288�_create_block_collider�0 -other: _create_block_collider :: collider id�128�(a)�0 method: id(a) r�128�(b)�0 method: r(b) -row�524288�calculate_block_uvs�0 -other: calculate_block_uvs :: row x�128�(c)�0 method: x(c) Modified: tests/ctags/gdscript-no-implicit-class.gd.tags 14 lines changed, 0 insertions(+), 14 deletions(-) =================================================================== @@ -38,20 +38,6 @@ foooooooo method: String Something :: foooooooo() inferred_type�16384�0 variable: inferred_type -local_var�524288�some_function�0 -other: some_function :: local_var -local_var2�524288�some_function�0 -other: some_function :: local_var2 -lv�524288�_init�0 -other: _init :: lv -p1�524288�something�0 -other: something :: p1 -p2�524288�something�0 -other: something :: p2 -param1�524288�some_function�0�Vector3 -other: Vector3 some_function :: param1 -param2�524288�some_function�0�int -other: int some_function :: param2 s�16384�0 variable: s sig�16384�0 Modified: tests/ctags/simple.py.tags 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -26,8 +26,8 @@ deeply_nested class: _test.ignored_function.more_nesting :: deeply_nested even_more�128�()�_test.ignored_function.more_nesting.deeply_nested�0 method: _test.ignored_function.more_nesting.deeply_nested :: even_more() -foo�16�( x , y, z)�0 -function: foo( x , y, z) +foo�16�( x, y, z)�0 +function: foo( x, y, z) ignored_function�16�()�_test�0 function: _test :: ignored_function() more_nesting�16�()�_test.ignored_function�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] 49aad2: Fix link to GH issues (#44)
by Daeraxa 21 Sep '22

21 Sep '22

Branch: refs/heads/master Author: Daeraxa <58074586+Daeraxa(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: Wed, 21 Sep 2022 20:20:37 UTC Commit: 49aad248393dbc128b88eb0fdcd95aa7a6e022f6 https://github.com/geany/www.geany.org/commit/49aad248393dbc128b88eb0fdcd95… Log Message: ----------- Fix link to GH issues (#44) GH issues link was incorrect and linked to the matrix channel. Modified Paths: -------------- page_content/about/geany.md Modified: page_content/about/geany.md 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -35,7 +35,7 @@ The code is licensed under the terms of the [GNU General Public Licence][3]. ## Contact -To contact us for general questions or feedback, either use one of our [mailing lists][4], the Matrix channel [#geany:matrix.org][5] or the [Github issue tracker][5]. +To contact us for general questions or feedback, either use one of our [mailing lists][4], the Matrix channel [#geany:matrix.org][5] or the [Github issue tracker][6]. [1]: /about/filetypes/ [2]: /support/plugins/ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 99d78d: Use meson when building from git
by Jiří Techet 21 Sep '22

21 Sep '22

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 21 Sep 2022 09:36:31 UTC Commit: 99d78d7707558e6c481b1f15999ee4408d792666 https://github.com/geany/geany-osx/commit/99d78d7707558e6c481b1f15999ee4408… Log Message: ----------- Use meson when building from git Also fix git url Modified Paths: -------------- geany.modules Modified: geany.modules 8 lines changed, 3 insertions(+), 5 deletions(-) =================================================================== @@ -5,7 +5,7 @@ <repository type="tarball" name="ftp.gnome.org" href="https://ftp.gnome.org/pub/GNOME/sources/"/> <repository type="git" name="github.com" - href="git://github.com/"/> + href="https://github.com/"/> <repository type="git" name="gitlab.gnome.org" href="https://gitlab.gnome.org/GNOME/"/> <repository type="tarball" name="download.gitlab.gnome.org" @@ -92,9 +92,7 @@ </metamodule>  - <autotools id="geany-git" - autogenargs="--enable-mac-integration" - supports-non-srcdir-builds="no"> + <meson id="geany-git" mesonargs="-Dmac-integration=enabled"> <branch repo="github.com" module="geany/geany.git" checkoutdir="geany-git" @@ -107,7 +105,7 @@ <dependencies> <dep package="geany-deps" /> </dependencies> - </autotools> + </meson>  <autotools id="geany-release" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2022