Branch: refs/heads/master Author: Jiří Techet techet@gmail.com Committer: Jiří Techet techet@gmail.com Date: Sun, 23 Jan 2022 16:44:14 UTC Commit: 79295ce727e9b7c667b616516655a8c61566e181 https://github.com/geany/geany/commit/79295ce727e9b7c667b616516655a8c61566e1...

Log Message: ----------- Use tm_parser_scope_separator() instead of symbols_get_context_separator()

symbols_get_context_separator() uses filetype ID as its argument and tm_parser_scope_separator() uses parser ID as its argument and those are easy to confuse. Use just one of them in Geany code to avoid errors.

Modified Paths: -------------- src/symbols.c

Modified: src/symbols.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -960,7 +960,7 @@ static const gchar *get_symbol_name(GeanyDocument *doc, const TMTag *tag, gboole if (!found_parent && scope && strpbrk(scope, GEANY_WORDCHARS) == scope) { - const gchar *sep = symbols_get_context_separator(doc->file_type->id); + const gchar *sep = tm_parser_scope_separator(tag->lang);

g_string_append(buffer, scope); g_string_append(buffer, sep); @@ -2451,7 +2451,7 @@ static gint get_current_tag_name(GeanyDocument *doc, gchar **tagname, TMTagType { if (tag->scope) *tagname = g_strconcat(tag->scope, - symbols_get_context_separator(doc->file_type->id), tag->name, NULL); + tm_parser_scope_separator(tag->lang), tag->name, NULL); else *tagname = g_strdup(tag->name);

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).