Commits August 2012

commits@lists.geany.org

1 participants
29 discussions

[geany/geany] a17e37: Test against the lexer instead of the filetype when computing
by Alexander Eberspächer 10 Aug '12

10 Aug '12

Branch: refs/heads/master Author: Alexander Eberspächer <alex.eberspaecher(a)gmail.com> Committer: Alexander Eberspächer <alex.eberspaecher(a)gmail.com> Date: Fri, 10 Aug 2012 09:34:56 Commit: a17e37bcd84c642136614c6e60a62a4c1bd7604a https://github.com/geany/geany/commit/a17e37bcd84c642136614c6e60a62a4c1bd76… Log Message: ----------- Test against the lexer instead of the filetype when computing indentation. This fixes Cython indentation. Modified Paths: -------------- src/editor.c Modified: src/editor.c 10 files changed, 8 insertions(+), 2 deletions(-) =================================================================== @@ -1401,10 +1401,16 @@ static gint get_indent_size_after_line(GeanyEditor *editor, gint line) gint additional_indent = 0; if (lexer_has_braces(sci)) + { additional_indent = iprefs->width * get_brace_indent(sci, line); + } else - if (editor->document->file_type->id == GEANY_FILETYPES_PYTHON) - additional_indent = iprefs->width * get_python_indent(sci, line); + { + /* Instead of testing the filetype directly, test for the lexer being + * used. Otherwise Cython indentation will break. */ + if (sci_get_lexer(sci) == SCLEX_PYTHON) + additional_indent = iprefs->width * get_python_indent(sci, line); + } /* HTML lexer "has braces" because of PHP and JavaScript. If get_brace_indent() did not * recommend us to insert additional indent, we are probably not in PHP/JavaScript chunk and @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 9a63e0: Change plugin manager's OK button response to GTK_RESPONSE_OK
by Matthew Brush 10 Aug '12

10 Aug '12

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Fri, 10 Aug 2012 05:36:03 Commit: 9a63e05f63871e2c89a32f59c585cc93538d74e0 https://github.com/geany/geany/commit/9a63e05f63871e2c89a32f59c585cc93538d7… Log Message: ----------- Change plugin manager's OK button response to GTK_RESPONSE_OK Used to be GTK_RESPONSE_CANCEL for some reason. Modified Paths: -------------- src/plugins.c Modified: src/plugins.c 4 files changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1375,6 +1375,8 @@ static void pm_on_plugin_button_clicked(GtkButton *button, gpointer user_data) } +/* Callback when plugin manager dialog closes, only ever has response of + * GTK_RESPONSE_OK or GTK_RESPONSE_DELETE_EVENT and both are treated the same. */ static void pm_dialog_response(GtkDialog *dialog, gint response, gpointer user_data) { if (plugin_list != NULL) @@ -1413,7 +1415,7 @@ static void pm_show_dialog(GtkMenuItem *menuitem, gpointer user_data) pm_widgets.dialog = gtk_dialog_new_with_buttons(_("Plugins"), GTK_WINDOW(main_widgets.window), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_OK, GTK_RESPONSE_CANCEL, NULL); + GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); vbox = ui_dialog_vbox_new(GTK_DIALOG(pm_widgets.dialog)); gtk_widget_set_name(pm_widgets.dialog, "GeanyDialog"); gtk_box_set_spacing(GTK_BOX(vbox), 6); @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] bc5b68: Remove indirection from callback handler
by Matthew Brush 10 Aug '12

10 Aug '12

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Fri, 10 Aug 2012 05:35:16 Commit: bc5b68822dee11a7c007fee633cf97db0a55b8dd https://github.com/geany/geany/commit/bc5b68822dee11a7c007fee633cf97db0a55b… Log Message: ----------- Remove indirection from callback handler Modified Paths: -------------- src/plugins.c Modified: src/plugins.c 20 files changed, 10 insertions(+), 10 deletions(-) =================================================================== @@ -1051,11 +1051,19 @@ void plugins_load_active(void) } +/* Update the global active plugins list so it's up-to-date when configuration + * is saved. Called in response to GeanyObject's "save-settings" signal. */ static void update_active_plugins_pref(void) { gint i = 0; GList *list; - gsize count = g_list_length(active_plugin_list) + g_list_length(failed_plugins_list); + gsize count; + + /* if plugins are disabled, don't clear list of active plugins */ + if (!want_plugins) + return; + + count = g_list_length(active_plugin_list) + g_list_length(failed_plugins_list); g_strfreev(active_plugins_pref); @@ -1085,14 +1093,6 @@ static void update_active_plugins_pref(void) } -static void on_save_settings(GKeyFile *config) -{ - /* if plugins are disabled, don't clear list of active plugins */ - if (want_plugins) - update_active_plugins_pref(); -} - - /* called even if plugin support is disabled */ void plugins_init(void) { @@ -1111,7 +1111,7 @@ void plugins_init(void) stash_group_add_entry(group, &prefs.custom_plugin_path, "custom_plugin_path", "", "extra_plugin_path_entry"); - g_signal_connect(geany_object, "save-settings", G_CALLBACK(on_save_settings), NULL); + g_signal_connect(geany_object, "save-settings", G_CALLBACK(update_active_plugins_pref), NULL); stash_group_add_string_vector(group, &active_plugins_pref, "active_plugins", NULL); } @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] e62bec: Use `g_build_filename()` instead of `g_strconcat()` for paths
by Matthew Brush 10 Aug '12

10 Aug '12

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Fri, 10 Aug 2012 01:21:43 Commit: e62bec43fcf31451242ea1b8c6107bebab7f9f8b https://github.com/geany/geany/commit/e62bec43fcf31451242ea1b8c6107bebab7f9… Log Message: ----------- Use `g_build_filename()` instead of `g_strconcat()` for paths Modified Paths: -------------- src/editor.c src/filetypes.c src/keybindings.c src/keyfile.c src/main.c src/msgwindow.c src/plugins.c src/project.c src/symbols.c Modified: src/editor.c 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -266,13 +266,12 @@ void editor_snippets_init(void) snippet_offsets = g_queue_new(); - sysconfigfile = g_strconcat(app->datadir, G_DIR_SEPARATOR_S, "snippets.conf", NULL); - userconfigfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "snippets.conf", NULL); + sysconfigfile = g_build_filename(app->datadir, "snippets.conf", NULL); + userconfigfile = g_build_filename(app->configdir, "snippets.conf", NULL); /* check for old autocomplete.conf files (backwards compatibility) */ if (! g_file_test(userconfigfile, G_FILE_TEST_IS_REGULAR)) - SETPTR(userconfigfile, - g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "autocomplete.conf", NULL)); + SETPTR(userconfigfile, g_build_filename(app->configdir, "autocomplete.conf", NULL)); /* load the actual config files */ g_key_file_load_from_file(sysconfig, sysconfigfile, G_KEY_FILE_NONE, NULL); Modified: src/filetypes.c 18 files changed, 9 insertions(+), 9 deletions(-) =================================================================== @@ -1270,16 +1270,18 @@ static void add_keys(GKeyFile *dest, const gchar *group, GKeyFile *src) static gchar *filetypes_get_filename(GeanyFiletype *ft, gboolean user) { gchar *ext = filetypes_get_conf_extension(ft); - gchar *f; + gchar *base_name = g_strconcat("filetypes.", ext, NULL); + gchar *file_name; if (user) - f = g_strconcat(app->configdir, G_DIR_SEPARATOR_S - GEANY_FILEDEFS_SUBDIR G_DIR_SEPARATOR_S, "filetypes.", ext, NULL); + file_name = g_build_filename(app->configdir, GEANY_FILEDEFS_SUBDIR, base_name, NULL); else - f = g_strconcat(app->datadir, G_DIR_SEPARATOR_S "filetypes.", ext, NULL); + file_name = g_build_filename(app->datadir, base_name, NULL); g_free(ext); - return f; + g_free(base_name); + + return file_name; } @@ -1688,10 +1690,8 @@ static void read_groups(GKeyFile *config) static void read_filetype_config(void) { - gchar *sysconfigfile = g_strconcat(app->datadir, G_DIR_SEPARATOR_S, - "filetype_extensions.conf", NULL); - gchar *userconfigfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, - "filetype_extensions.conf", NULL); + gchar *sysconfigfile = g_build_filename(app->datadir, "filetype_extensions.conf", NULL); + gchar *userconfigfile = g_build_filename(app->configdir, "filetype_extensions.conf", NULL); GKeyFile *sysconfig = g_key_file_new(); GKeyFile *userconfig = g_key_file_new(); Modified: src/keybindings.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -662,13 +662,13 @@ static void load_kb(GeanyKeyGroup *group, GeanyKeyBinding *kb, gpointer user_dat static void load_user_kb(void) { - gchar *configfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "keybindings.conf", NULL); + gchar *configfile = g_build_filename(app->configdir, "keybindings.conf", NULL); GKeyFile *config = g_key_file_new(); /* backwards compatibility with Geany 0.21 defaults */ if (!g_file_test(configfile, G_FILE_TEST_EXISTS)) { - gchar *geanyconf = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "geany.conf", NULL); + gchar *geanyconf = g_build_filename(app->configdir, "geany.conf", NULL); const gchar data[] = "[Bindings]\n" "popup_gototagdefinition=\n" "edit_transposeline=<Control>t\n" @@ -771,7 +771,7 @@ static void set_keyfile_kb(GeanyKeyGroup *group, GeanyKeyBinding *kb, gpointer u /* just write the content of the keys array to the config file */ void keybindings_write_to_file(void) { - gchar *configfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "keybindings.conf", NULL); + gchar *configfile = g_build_filename(app->configdir, "keybindings.conf", NULL); gchar *data; GKeyFile *config = g_key_file_new(); Modified: src/keyfile.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -576,7 +576,7 @@ static void save_ui_prefs(GKeyFile *config) void configuration_save(void) { GKeyFile *config = g_key_file_new(); - gchar *configfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "geany.conf", NULL); + gchar *configfile = g_build_filename(app->configdir, "geany.conf", NULL); gchar *data; g_key_file_load_from_file(config, configfile, G_KEY_FILE_NONE, NULL); @@ -984,7 +984,7 @@ static void load_ui_prefs(GKeyFile *config) */ void configuration_save_default_session(void) { - gchar *configfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "geany.conf", NULL); + gchar *configfile = g_build_filename(app->configdir, "geany.conf", NULL); gchar *data; GKeyFile *config = g_key_file_new(); Modified: src/main.c 10 files changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -375,13 +375,13 @@ static void setup_paths(void) * documentation and data files */ gchar *install_dir = win32_get_installation_dir(); - data_dir = g_strconcat(install_dir, "\\data", NULL); /* e.g. C:\Program Files\geany\data */ - doc_dir = g_strconcat(install_dir, "\\doc", NULL); + data_dir = g_build_filename(install_dir, "data", NULL); /* e.g. C:\Program Files\geany\data */ + doc_dir = g_build_filename(install_dir, "doc", NULL); g_free(install_dir); #else - data_dir = g_strconcat(GEANY_DATADIR, "/geany", NULL); /* e.g. /usr/share/geany */ - doc_dir = g_strconcat(GEANY_DOCDIR, "/html", NULL); + data_dir = g_build_filename(GEANY_DATADIR, "geany", NULL); /* e.g. /usr/share/geany */ + doc_dir = g_build_filename(GEANY_DOCDIR, "html", NULL); #endif /* convert path names to locale encoding */ @@ -449,7 +449,7 @@ void main_locale_init(const gchar *locale_dir, const gchar *package) { gchar *install_dir = win32_get_installation_dir(); /* e.g. C:\Program Files\geany\lib\locale */ - l_locale_dir = g_strconcat(install_dir, "\\share\\locale", NULL); + l_locale_dir = g_build_filename(install_dir, "share", "locale", NULL); g_free(install_dir); } #else Modified: src/msgwindow.c 3 files changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -744,8 +744,7 @@ static void make_absolute(gchar **filename, const gchar *dir) /* add directory */ if (! utils_is_absolute_path(*filename)) - SETPTR(*filename, g_strconcat(dir, G_DIR_SEPARATOR_S, - *filename + skip_dot_slash, NULL)); + SETPTR(*filename, g_build_filename(dir, *filename + skip_dot_slash, NULL)); } Modified: src/plugins.c 10 files changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -883,7 +883,7 @@ static gboolean check_plugin_path(const gchar *fname) gchar *plugin_path_custom; gboolean ret = FALSE; - plugin_path_config = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "plugins", NULL); + plugin_path_config = g_build_filename(app->configdir, "plugins", NULL); if (g_str_has_prefix(fname, plugin_path_config)) ret = TRUE; @@ -942,7 +942,7 @@ static gboolean check_plugin_path(const gchar *fname) if (tmp == NULL || utils_str_casecmp(tmp, "." G_MODULE_SUFFIX) != 0) continue; - fname = g_strconcat(path, G_DIR_SEPARATOR_S, item->data, NULL); + fname = g_build_filename(path, item->data, NULL); if (plugin_new(fname, FALSE, TRUE)) count++; g_free(fname); @@ -962,12 +962,12 @@ static gchar *get_plugin_path(void) gchar *path; gchar *install_dir = win32_get_installation_dir(); - path = g_strconcat(install_dir, "\\lib", NULL); + path = g_build_filename(install_dir, "lib", NULL); g_free(install_dir); return path; #else - return g_strconcat(GEANY_LIBDIR, G_DIR_SEPARATOR_S "geany", NULL); + return g_build_filename(GEANY_LIBDIR, "geany", NULL); #endif } @@ -979,7 +979,7 @@ static void load_all_plugins(void) gchar *plugin_path_system; gchar *plugin_path_custom; - plugin_path_config = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "plugins", NULL); + plugin_path_config = g_build_filename(app->configdir, "plugins", NULL); plugin_path_system = get_plugin_path(); /* first load plugins in ~/.config/geany/plugins/ */ Modified: src/project.c 9 files changed, 4 insertions(+), 5 deletions(-) =================================================================== @@ -675,7 +675,7 @@ static gboolean update_config(const PropertyDialogElements *e, gboolean new_proj if (! g_path_is_absolute(locale_path)) { /* relative base path, so add base dir of project file name */ gchar *dir = g_path_get_dirname(locale_filename); - SETPTR(locale_path, g_strconcat(dir, G_DIR_SEPARATOR_S, locale_path, NULL)); + SETPTR(locale_path, g_strconcat(dir, locale_path, NULL)); g_free(dir); } @@ -1097,8 +1097,8 @@ gchar *project_get_base_path(void) if (utils_str_equal(project->base_path, "./")) return dir; - else - path = g_strconcat(dir, G_DIR_SEPARATOR_S, project->base_path, NULL); + + path = g_build_filename(dir, project->base_path, NULL); g_free(dir); return path; } @@ -1135,8 +1135,7 @@ void project_load_prefs(GKeyFile *config) "project_file_path", NULL); if (local_prefs.project_file_path == NULL) { - local_prefs.project_file_path = g_strconcat(g_get_home_dir(), - G_DIR_SEPARATOR_S, PROJECT_DIR, NULL); + local_prefs.project_file_path = g_build_filename(g_get_home_dir(), PROJECT_DIR, NULL); } } Modified: src/symbols.c 8 files changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -114,7 +114,7 @@ enum /* Geany tag files */ * Also works for reloading. */ static void load_c_ignore_tags(void) { - gchar *path = g_strconcat(app->configdir, G_DIR_SEPARATOR_S "ignore.tags", NULL); + gchar *path = g_build_filename(app->configdir, "ignore.tags", NULL); gchar *content; if (g_file_get_contents(path, &content, NULL, NULL)) @@ -209,7 +209,7 @@ void symbols_global_tags_loaded(guint file_type_idx) if (! tfi->tags_loaded) { - gchar *fname = g_strconcat(app->datadir, G_DIR_SEPARATOR_S, tfi->tag_file, NULL); + gchar *fname = g_build_filename(app->datadir, tfi->tag_file, NULL); symbols_load_global_tags(fname, filetypes[file_type_idx]); tfi->tags_loaded = TRUE; @@ -229,7 +229,7 @@ static void html_tags_loaded(void) tfi = &tag_file_info[GTF_HTML_ENTITIES]; if (! tfi->tags_loaded) { - gchar *file = g_strconcat(app->datadir, G_DIR_SEPARATOR_S, tfi->tag_file, NULL); + gchar *file = g_build_filename(app->datadir, tfi->tag_file, NULL); html_entities = utils_read_file_in_array(file); tfi->tags_loaded = TRUE; @@ -548,7 +548,7 @@ static GdkPixbuf *get_tag_icon(const gchar *icon_name) if (G_UNLIKELY(icon_theme == NULL)) { #ifndef G_OS_WIN32 - gchar *path = g_strconcat(GEANY_DATADIR, "/icons", NULL); + gchar *path = g_build_filename(GEANY_DATADIR, "icons", NULL); #endif gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &x, &y); icon_theme = gtk_icon_theme_get_default(); @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] c2c6a7: Open files with leading or trailing whitespaces through the socket
by Colomban Wendling 08 Aug '12

08 Aug '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 08 Aug 2012 13:35:46 Commit: c2c6a70515d8863347b7022bcf35970b933c1a57 https://github.com/geany/geany/commit/c2c6a70515d8863347b7022bcf35970b933c1… Log Message: ----------- Open files with leading or trailing whitespaces through the socket Modified Paths: -------------- src/socket.c Modified: src/socket.c 8 files changed, 7 insertions(+), 1 deletions(-) =================================================================== @@ -611,7 +611,13 @@ gboolean socket_lock_input_cb(GIOChannel *source, GIOCondition condition, gpoint cl_options.readonly = strncmp(buf+4, "ro", 2) == 0; /* open in readonly? */ while (socket_fd_gets(sock, buf, sizeof(buf)) != -1 && *buf != '.') { - handle_input_filename(g_strstrip(buf)); + gsize buf_len = strlen(buf); + + /* remove trailing newline */ + if (buf_len > 0 && buf[buf_len - 1] == '\n') + buf[buf_len - 1] = '\0'; + + handle_input_filename(buf); } popup = TRUE; } @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] d152c5: Properly indent even if the indenting character isn't the last one
by Colomban Wendling 07 Aug '12

07 Aug '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 07 Aug 2012 15:50:17 Commit: d152c5ce2235c0bd34cc76613e3045100f95a4b9 https://github.com/geany/geany/commit/d152c5ce2235c0bd34cc76613e3045100f95a… Log Message: ----------- Properly indent even if the indenting character isn't the last one For all languages, this change allows comments at the end of the checked line, e.g.: if 42: # magic number print("I'm indented!") For languages with braces, it also properly indent if there is code on the same line as the opening brace, e.g.: if (42) { printf("some code here..."); printf("...but I'm properly indented"); } else { /* comment! */ printf("normal block is fine too, of course"); } Although this is uncommon (and quite ugly) it's valid and should be handled properly. Modified Paths: -------------- src/editor.c Modified: src/editor.c 61 files changed, 34 insertions(+), 27 deletions(-) =================================================================== @@ -1292,45 +1292,52 @@ static void read_indent(GeanyEditor *editor, gint pos) static gint get_brace_indent(ScintillaObject *sci, gint line) { - guint i, len; - gint ret = 0; - gchar *linebuf; - - len = sci_get_line_length(sci, line); - linebuf = sci_get_line(sci, line); + gint start = sci_get_position_from_line(sci, line); + gint end = sci_get_line_end_position(sci, line) - 1; + gint lexer = sci_get_lexer(sci); + gint count = 0; + gint pos; - for (i = 0; i < len; i++) + for (pos = end; pos >= start && count < 1; pos--) { - /* i == (len - 1) prevents wrong indentation after lines like - * " { return bless({}, shift); }" (Perl) */ - if (linebuf[i] == '{' && i == (len - 1)) + if (highlighting_is_code_style(lexer, sci_get_style_at(sci, pos))) { - ret++; - break; + gchar c = sci_get_char_at(sci, pos); + + if (c == '{') + count ++; + else if (c == '}') + count --; } - else - { - gint k = len - 1; + } - while (k > 0 && isspace(linebuf[k])) k--; + return count > 0 ? 1 : 0; +} - /* if last non-whitespace character is a { increase indentation by a tab - * e.g. for (...) { */ - if (linebuf[k] == '{') - { - ret++; - } + +/* gets the last code position on a line + * warning: if there is no code position on the line, returns the start position */ +static gint get_sci_line_code_end_position(ScintillaObject *sci, gint line) +{ + gint start = sci_get_position_from_line(sci, line); + gint lexer = sci_get_lexer(sci); + gint pos; + + for (pos = sci_get_line_end_position(sci, line) - 1; pos > start; pos--) + { + gint style = sci_get_style_at(sci, pos); + + if (highlighting_is_code_style(lexer, style) && ! isspace(sci_get_char_at(sci, pos))) break; - } } - g_free(linebuf); - return ret; + + return pos; } static gint get_python_indent(ScintillaObject *sci, gint line) { - gint last_char = sci_get_line_end_position(sci, line) - 1; + gint last_char = get_sci_line_code_end_position(sci, line); /* add extra indentation for Python after colon */ if (sci_get_char_at(sci, last_char) == ':' && @@ -1345,7 +1352,7 @@ static gint get_python_indent(ScintillaObject *sci, gint line) static gint get_xml_indent(ScintillaObject *sci, gint line) { gboolean need_close = FALSE; - gint end = sci_get_line_end_position(sci, line) - 1; + gint end = get_sci_line_code_end_position(sci, line); gint pos; /* don't indent if there's a closing tag to the right of the cursor */ @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 4c2d89: Fix a reference to a function in the documentation
by Colomban Wendling 07 Aug '12

07 Aug '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 07 Aug 2012 13:37:38 Commit: 4c2d8998d736d67215e0e1d7057505f19af6ae2f https://github.com/geany/geany/commit/4c2d8998d736d67215e0e1d7057505f19af6a… Log Message: ----------- Fix a reference to a function in the documentation Modified Paths: -------------- src/ui_utils.c Modified: src/ui_utils.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -2616,7 +2616,7 @@ void ui_menu_add_document_items(GtkMenu *menu, GeanyDocument *active, GCallback * @a compare_func might be NULL to not sort the documents in the menu. In this case, * the order of the document tabs is used. * - * See document_sort_by_display_name() for an example sort function. + * See document_compare_by_display_name() for an example sort function. * * @param menu Menu. * @param active Which document to highlight, or @c NULL. @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] e76a35: Minor tweak to D "!" template parameter list parsing code
by Matthew Brush 04 Aug '12

04 Aug '12

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Sat, 04 Aug 2012 02:07:58 Commit: e76a35c2715bfc015af6c965a972bc3eaec35460 https://github.com/geany/geany/commit/e76a35c2715bfc015af6c965a972bc3eaec35… Log Message: ----------- Minor tweak to D "!" template parameter list parsing code Note: Indentation left as is so that the diff is readable, next commit contains the indentation fix. Modified Paths: -------------- tagmanager/ctags/c.c Modified: tagmanager/ctags/c.c 13 files changed, 5 insertions(+), 8 deletions(-) =================================================================== @@ -2363,13 +2363,6 @@ static int parseParens (statementInfo *const st, parenInfo *const info) { int c = skipToNonWhite (); - if (isLanguage(Lang_d) && c == '!') - { /* template instantiation */ - info->isNameCandidate = FALSE; - info->isKnrParamList = FALSE; - } - else - { switch (c) { case '&': @@ -2481,6 +2474,11 @@ static int parseParens (statementInfo *const st, parenInfo *const info) info->isNameCandidate = FALSE; } } + else if (isLanguage(Lang_d) && c == '!') + { /* D template instantiation */ + info->isNameCandidate = FALSE; + info->isKnrParamList = FALSE; + } else { info->isParamList = FALSE; @@ -2491,7 +2489,6 @@ static int parseParens (statementInfo *const st, parenInfo *const info) break; } } - } firstChar = FALSE; } while (! info->nestedArgs && depth > 0 && (info->isKnrParamList || info->isNameCandidate)); @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 63249c: Dedent switch block from last commit, pure noise
by Matthew Brush 04 Aug '12

04 Aug '12

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Sat, 04 Aug 2012 02:07:58 Commit: 63249c71e82a2fa9bd56b3e151f901a85fdea394 https://github.com/geany/geany/commit/63249c71e82a2fa9bd56b3e151f901a85fdea… Log Message: ----------- Dedent switch block from last commit, pure noise Modified Paths: -------------- tagmanager/ctags/c.c Modified: tagmanager/ctags/c.c 206 files changed, 103 insertions(+), 103 deletions(-) =================================================================== @@ -2363,132 +2363,132 @@ static int parseParens (statementInfo *const st, parenInfo *const info) { int c = skipToNonWhite (); - switch (c) + switch (c) + { + case '&': + case '*': { - case '&': - case '*': - { - /* DEBUG_PRINT("parseParens, po++\n"); */ - info->isKnrParamList = FALSE; - if (identifierCount == 0) - info->isParamList = FALSE; - initToken (token); - break; - } - case ':': + /* DEBUG_PRINT("parseParens, po++\n"); */ + info->isKnrParamList = FALSE; + if (identifierCount == 0) + info->isParamList = FALSE; + initToken (token); + break; + } + case ':': + { + info->isKnrParamList = FALSE; + break; + } + case '.': + { + info->isNameCandidate = FALSE; + info->isKnrParamList = FALSE; + break; + } + case ',': + { + info->isNameCandidate = FALSE; + if (info->isKnrParamList) { - info->isKnrParamList = FALSE; - break; + ++info->parameterCount; + identifierCount = 0; } - case '.': + break; + } + case '=': + { + info->isKnrParamList = FALSE; + info->isNameCandidate = FALSE; + if (firstChar) { - info->isNameCandidate = FALSE; - info->isKnrParamList = FALSE; - break; + info->isParamList = FALSE; + skipMacro (st); + depth = 0; } - case ',': - { - info->isNameCandidate = FALSE; - if (info->isKnrParamList) - { - ++info->parameterCount; - identifierCount = 0; - } - break; - } - case '=': + break; + } + case '[': + { + info->isKnrParamList = FALSE; + skipToMatch ("[]"); + break; + } + case '<': + { + info->isKnrParamList = FALSE; + skipToMatch ("<>"); + break; + } + case ')': + { + if (firstChar) + info->parameterCount = 0; + --depth; + break; + } + case '(': + { + info->isKnrParamList = FALSE; + if (firstChar) { - info->isKnrParamList = FALSE; info->isNameCandidate = FALSE; - if (firstChar) - { - info->isParamList = FALSE; - skipMacro (st); - depth = 0; - } - break; - } - case '[': - { - info->isKnrParamList = FALSE; - skipToMatch ("[]"); - break; - } - case '<': - { - info->isKnrParamList = FALSE; - skipToMatch ("<>"); - break; - } - case ')': - { - if (firstChar) - info->parameterCount = 0; - --depth; - break; + cppUngetc (c); + skipMacro (st); + depth = 0; } - case '(': + else if (isType (token, TOKEN_PAREN_NAME)) { - info->isKnrParamList = FALSE; - if (firstChar) - { - info->isNameCandidate = FALSE; - cppUngetc (c); - skipMacro (st); - depth = 0; - } - else if (isType (token, TOKEN_PAREN_NAME)) + c = skipToNonWhite (); + if (c == '*') /* check for function pointer */ { + skipToMatch ("()"); c = skipToNonWhite (); - if (c == '*') /* check for function pointer */ - { + if (c == '(') skipToMatch ("()"); - c = skipToNonWhite (); - if (c == '(') - skipToMatch ("()"); - } - else - { - cppUngetc (c); - cppUngetc ('('); - info->nestedArgs = TRUE; - } } else - ++depth; - break; + { + cppUngetc (c); + cppUngetc ('('); + info->nestedArgs = TRUE; + } } + else + ++depth; + break; + } - default: + default: + { + if (isident1 (c)) { - if (isident1 (c)) - { - if (++identifierCount > 1) - info->isKnrParamList = FALSE; - readIdentifier (token, c); - if (isType (token, TOKEN_NAME) && info->isNameCandidate) - token->type = TOKEN_PAREN_NAME; - else if (isType (token, TOKEN_KEYWORD)) - { - info->isKnrParamList = FALSE; - info->isNameCandidate = FALSE; - } - } - else if (isLanguage(Lang_d) && c == '!') - { /* D template instantiation */ - info->isNameCandidate = FALSE; + if (++identifierCount > 1) info->isKnrParamList = FALSE; - } - else + readIdentifier (token, c); + if (isType (token, TOKEN_NAME) && info->isNameCandidate) + token->type = TOKEN_PAREN_NAME; + else if (isType (token, TOKEN_KEYWORD)) { - info->isParamList = FALSE; - info->isKnrParamList = FALSE; + info->isKnrParamList = FALSE; info->isNameCandidate = FALSE; - info->invalidContents = TRUE; } - break; } + else if (isLanguage(Lang_d) && c == '!') + { /* D template instantiation */ + info->isNameCandidate = FALSE; + info->isKnrParamList = FALSE; + } + else + { + info->isParamList = FALSE; + info->isKnrParamList = FALSE; + info->isNameCandidate = FALSE; + info->invalidContents = TRUE; + } + break; } + } firstChar = FALSE; } while (! info->nestedArgs && depth > 0 && (info->isKnrParamList || info->isNameCandidate)); @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2012