Plugins-Commits January 2016

plugins-commits@lists.geany.org

1 participants
56 discussions

[geany/geany-plugins] 115fdb: lineoperations: general formatting/cleanup
by Sylvan Mostert 17 Jan '16

17 Jan '16

Branch: refs/heads/master Author: Sylvan Mostert <smostert.dev(a)gmail.com> Committer: Sylvan Mostert <smostert.dev(a)gmail.com> Date: Sun, 17 Jan 2016 17:49:00 UTC Commit: 115fdb2d2a6791b953a7cbe0f1062526d8385e47 https://github.com/geany/geany-plugins/commit/115fdb2d2a6791b953a7cbe0f1062… Log Message: ----------- lineoperations: general formatting/cleanup Removed trailing spaces, and changed all indents to tabs. Modified Paths: -------------- Makefile.am lineoperations/src/linefunctions.c lineoperations/src/lineoperations.c Modified: Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -110,6 +110,7 @@ endif if ENABLE_LINEOPERATIONS SUBDIRS += lineoperations endif + if ENABLE_MARKDOWN SUBDIRS += markdown endif Modified: lineoperations/src/linefunctions.c 37 lines changed, 18 insertions(+), 19 deletions(-) =================================================================== @@ -36,6 +36,7 @@ static void ensure_final_newline(GeanyEditor *editor, gint max_lines) } } + /* comparison function to be used in qsort */ static gint compare_asc(const void * a, const void * b) { @@ -88,7 +89,7 @@ void rmdupst(GeanyDocument *doc) { nf_end = g_stpcpy(nf_end, lines[i]); } - /* set new document */ + /* set new document */ sci_set_text(doc->editor->sci, new_file); /* free used memory */ @@ -146,7 +147,7 @@ void rmdupln(GeanyDocument *doc) { if(!to_remove[i]) nf_end = g_stpcpy(nf_end, lines[i]); - /* set new document */ + /* set new document */ sci_set_text(doc->editor->sci, new_file); /* free used memory */ @@ -208,7 +209,7 @@ void rmunqln(GeanyDocument *doc) { if(!to_remove[i]) nf_end = g_stpcpy(nf_end, lines[i]); - /* set new document */ + /* set new document */ sci_set_text(doc->editor->sci, new_file); /* free used memory */ @@ -235,9 +236,9 @@ void rmemtyln(GeanyDocument *doc) { sci_get_line_end_position(doc->editor->sci, i)) { scintilla_send_message(doc->editor->sci, - SCI_DELETERANGE, - sci_get_position_from_line(doc->editor->sci, i), - sci_get_line_length(doc->editor->sci, i)); + SCI_DELETERANGE, + sci_get_position_from_line(doc->editor->sci, i), + sci_get_line_length(doc->editor->sci, i)); total_num_lines--; i--; } @@ -247,8 +248,6 @@ void rmemtyln(GeanyDocument *doc) { } - - /* Remove Whitespace Lines */ void rmwhspln(GeanyDocument *doc) { gint total_num_lines; /* number of lines in the document */ @@ -256,24 +255,24 @@ void rmwhspln(GeanyDocument *doc) { gint i; /* iterator */ total_num_lines = sci_get_line_count(doc->editor->sci); - + sci_start_undo_action(doc->editor->sci); for(i = 0; i < total_num_lines; i++) /* loop through opened doc */ { indent = scintilla_send_message(doc->editor->sci, - SCI_GETLINEINDENTPOSITION, - i, 0); + SCI_GETLINEINDENTPOSITION, + i, 0); if(indent - - sci_get_position_from_line(doc->editor->sci, i) == - sci_get_line_end_position(doc->editor->sci, i)- - sci_get_position_from_line(doc->editor->sci, i)) + sci_get_position_from_line(doc->editor->sci, i) == + sci_get_line_end_position(doc->editor->sci, i)- + sci_get_position_from_line(doc->editor->sci, i)) { scintilla_send_message(doc->editor->sci, - SCI_DELETERANGE, - sci_get_position_from_line(doc->editor->sci, i), - sci_get_line_length(doc->editor->sci, i)); + SCI_DELETERANGE, + sci_get_position_from_line(doc->editor->sci, i), + sci_get_line_length(doc->editor->sci, i)); total_num_lines--; i--; } @@ -316,8 +315,8 @@ void sortlines(GeanyDocument *doc, gboolean asc) { /* join **lines into one string (new_file) */ lines[total_num_lines] = NULL; new_file = g_strjoinv("", lines); - - /* set new document */ + + /* set new document */ sci_set_text(doc->editor->sci, new_file); /* free used memory */ Modified: lineoperations/src/lineoperations.c 14 lines changed, 7 insertions(+), 7 deletions(-) =================================================================== @@ -122,13 +122,13 @@ void geany_load_module(GeanyPlugin *plugin) { main_locale_init(LOCALEDIR, GETTEXT_PACKAGE); - plugin->info->name = _("Line Operations"); - plugin->info->description = _("Line Operations provides a handful of functions that can be applied to a document such as, removing duplicate lines, removing empty lines, removing lines with only whitespace, and sorting lines."); - plugin->info->version = "0.1"; - plugin->info->author = _("Sylvan Mostert <smostert.dev(a)gmail.com>"); + plugin->info->name = _("Line Operations"); + plugin->info->description = _("Line Operations provides a handful of functions that can be applied to a document such as, removing duplicate lines, removing empty lines, removing lines with only whitespace, and sorting lines."); + plugin->info->version = "0.1"; + plugin->info->author = _("Sylvan Mostert <smostert.dev(a)gmail.com>"); - plugin->funcs->init = lo_init; - plugin->funcs->cleanup = lo_cleanup; + plugin->funcs->init = lo_init; + plugin->funcs->cleanup = lo_cleanup; - GEANY_PLUGIN_REGISTER(plugin, 225); + GEANY_PLUGIN_REGISTER(plugin, 225); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] ee3546: lineoperations: Fix underallocation in sortlines()
by Colomban Wendling 17 Jan '16

17 Jan '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 17 Jan 2016 14:36:42 UTC Commit: ee354655993507b7b998a3c13e4417ea0b1286af https://github.com/geany/geany-plugins/commit/ee354655993507b7b998a3c13e441… Log Message: ----------- lineoperations: Fix underallocation in sortlines() An overlooked operator priority lead to underallocating `sizeof(gchar*)-1` bytes, later leading to an invalid memory access. Modified Paths: -------------- lineoperations/src/linefunctions.c Modified: lineoperations/src/linefunctions.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -295,7 +295,7 @@ void sortlines(GeanyDocument *doc, gboolean asc) { total_num_chars = sci_get_length(doc->editor->sci); total_num_lines = sci_get_line_count(doc->editor->sci); - lines = g_malloc(sizeof(gchar *) * total_num_lines+1); + lines = g_malloc(sizeof(gchar *) * (total_num_lines+1)); new_file = g_malloc(sizeof(gchar) * (total_num_chars+1)); new_file[0] = '\0'; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] f05a05: lineoperations: Make wrapper callbacks more generic
by Colomban Wendling 17 Jan '16

17 Jan '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 17 Jan 2016 14:18:54 UTC Commit: f05a05b67e8451d619ec90aa41ebb7c54f6b0039 https://github.com/geany/geany-plugins/commit/f05a05b67e8451d619ec90aa41ebb… Log Message: ----------- lineoperations: Make wrapper callbacks more generic Modified Paths: -------------- lineoperations/src/lineoperations.c Modified: lineoperations/src/lineoperations.c 92 lines changed, 23 insertions(+), 69 deletions(-) =================================================================== @@ -27,80 +27,26 @@ static GtkWidget *main_menu_item = NULL; -/* Remove Duplicate Lines, sorted */ +/* call custom func */ static void -action_rmdupst_item(GtkMenuItem *menuitem, gpointer gdata) +action_func_item(GtkMenuItem *menuitem, gpointer gdata) { + void (*func)(GeanyDocument *) = gdata; GeanyDocument *doc = NULL; doc = document_get_current(); - if(doc) rmdupst(doc); + if(doc) func(doc); } -/* Remove Duplicate Lines, ordered */ +/* Sort Lines */ static void -action_rmdupln_item(GtkMenuItem *menuitem, gpointer gdata) +action_sort_item(GtkMenuItem *menuitem, gpointer gdata) { GeanyDocument *doc = NULL; doc = document_get_current(); - if(doc) rmdupln(doc); -} - - -/* Remove Unique Lines */ -static void -action_rmunqln_item(GtkMenuItem *menuitem, gpointer gdata) -{ - GeanyDocument *doc = NULL; - doc = document_get_current(); - - if(doc) rmunqln(doc); -} - - -/* Remove Empty Lines */ -static void -action_rmemtyln_item(GtkMenuItem *menuitem, gpointer gdata) -{ - GeanyDocument *doc = NULL; - doc = document_get_current(); - - if(doc) rmemtyln(doc); -} - - -/* Remove Whitespace Lines */ -static void -action_rmwhspln_item(GtkMenuItem *menuitem, gpointer gdata) -{ - GeanyDocument *doc = NULL; - doc = document_get_current(); - - if(doc) rmwhspln(doc); -} - - -/* Sort Lines Ascending */ -static void -action_sortasc_item(GtkMenuItem *menuitem, gpointer gdata) -{ - GeanyDocument *doc = NULL; - doc = document_get_current(); - - if(doc) sortlines(doc, 1); -} - - -/* Sort Lines Descending */ -static void -action_sortdesc_item(GtkMenuItem *menuitem, gpointer gdata) -{ - GeanyDocument *doc = NULL; - doc = document_get_current(); - - if(doc) sortlines(doc, 0); + if(doc) sortlines(doc, GPOINTER_TO_INT(gdata)); } @@ -114,16 +60,24 @@ lo_init(GeanyPlugin *plugin, gpointer gdata) struct { const gchar *label; GCallback cb_activate; + gpointer cb_data; } menu_items[] = { - { N_("Remove Duplicate Lines, _Sorted"), G_CALLBACK(action_rmdupst_item) }, - { N_("Remove Duplicate Lines, _Ordered"), G_CALLBACK(action_rmdupln_item) }, - { N_("Remove _Unique Lines"), G_CALLBACK(action_rmunqln_item) }, + { N_("Remove Duplicate Lines, _Sorted"), + G_CALLBACK(action_func_item), (gpointer) rmdupst }, + { N_("Remove Duplicate Lines, _Ordered"), + G_CALLBACK(action_func_item), (gpointer) rmdupln }, + { N_("Remove _Unique Lines"), + G_CALLBACK(action_func_item), (gpointer) rmunqln }, { NULL }, - { N_("Remove _Empty Lines"), G_CALLBACK(action_rmemtyln_item) }, - { N_("Remove _Whitespace Lines"), G_CALLBACK(action_rmwhspln_item) }, + { N_("Remove _Empty Lines"), + G_CALLBACK(action_func_item), (gpointer) rmemtyln }, + { N_("Remove _Whitespace Lines"), + G_CALLBACK(action_func_item), (gpointer) rmwhspln }, { NULL }, - { N_("Sort Lines _Ascending"), G_CALLBACK(action_sortasc_item) }, - { N_("Sort Lines _Descending"), G_CALLBACK(action_sortdesc_item) } + { N_("Sort Lines _Ascending"), + G_CALLBACK(action_sort_item), GINT_TO_POINTER(1) }, + { N_("Sort Lines _Descending"), + G_CALLBACK(action_sort_item), GINT_TO_POINTER(0) } }; main_menu_item = gtk_menu_item_new_with_mnemonic(_("_Line Operations")); @@ -141,7 +95,7 @@ lo_init(GeanyPlugin *plugin, gpointer gdata) else { item = gtk_menu_item_new_with_mnemonic(_(menu_items[i].label)); - g_signal_connect(item, "activate", menu_items[i].cb_activate, NULL); + g_signal_connect(item, "activate", menu_items[i].cb_activate, menu_items[i].cb_data); ui_add_document_sensitive(item); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] de106a: lineoperations: Simplify menu building
by Colomban Wendling 17 Jan '16

17 Jan '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 17 Jan 2016 14:16:58 UTC Commit: de106a6b044d8296858e1559a7b402fa8424903f https://github.com/geany/geany-plugins/commit/de106a6b044d8296858e1559a7b40… Log Message: ----------- lineoperations: Simplify menu building Modified Paths: -------------- lineoperations/src/lineoperations.c Modified: lineoperations/src/lineoperations.c 87 lines changed, 31 insertions(+), 56 deletions(-) =================================================================== @@ -109,73 +109,48 @@ lo_init(GeanyPlugin *plugin, gpointer gdata) { GeanyData *geany_data = plugin->geany_data; - GtkWidget *submenu; - GtkWidget *sep1; - GtkWidget *sep2; - GtkWidget *rmdupst_item; - GtkWidget *rmdupln_item; - GtkWidget *rmunqln_item; - GtkWidget *rmemtyln_item; - GtkWidget *rmwhspln_item; - GtkWidget *sortasc_item; - GtkWidget *sortdesc_item; + guint i; + struct { + const gchar *label; + GCallback cb_activate; + } menu_items[] = { + { N_("Remove Duplicate Lines, _Sorted"), G_CALLBACK(action_rmdupst_item) }, + { N_("Remove Duplicate Lines, _Ordered"), G_CALLBACK(action_rmdupln_item) }, + { N_("Remove _Unique Lines"), G_CALLBACK(action_rmunqln_item) }, + { NULL }, + { N_("Remove _Empty Lines"), G_CALLBACK(action_rmemtyln_item) }, + { N_("Remove _Whitespace Lines"), G_CALLBACK(action_rmwhspln_item) }, + { NULL }, + { N_("Sort Lines _Ascending"), G_CALLBACK(action_sortasc_item) }, + { N_("Sort Lines _Descending"), G_CALLBACK(action_sortdesc_item) } + }; main_menu_item = gtk_menu_item_new_with_mnemonic(_("_Line Operations")); gtk_widget_show(main_menu_item); submenu = gtk_menu_new(); gtk_widget_show(submenu); - sep1 = gtk_separator_menu_item_new(); - sep2 = gtk_separator_menu_item_new(); - rmdupst_item = gtk_menu_item_new_with_mnemonic(_("Remove Duplicate Lines, _Sorted")); - rmdupln_item = gtk_menu_item_new_with_mnemonic(_("Remove Duplicate Lines, _Ordered")); - rmunqln_item = gtk_menu_item_new_with_mnemonic(_("Remove _Unique Lines")); - rmemtyln_item = gtk_menu_item_new_with_mnemonic(_("Remove _Empty Lines")); - rmwhspln_item = gtk_menu_item_new_with_mnemonic(_("Remove _Whitespace Lines")); - sortasc_item = gtk_menu_item_new_with_mnemonic(_("Sort Lines _Ascending")); - sortdesc_item = gtk_menu_item_new_with_mnemonic(_("Sort Lines _Descending")); - - gtk_widget_show(sep1); - gtk_widget_show(sep2); - gtk_widget_show(rmdupst_item); - gtk_widget_show(rmdupln_item); - gtk_widget_show(rmunqln_item); - gtk_widget_show(rmemtyln_item); - gtk_widget_show(rmwhspln_item); - gtk_widget_show(sortasc_item); - gtk_widget_show(sortdesc_item); - - gtk_menu_shell_append(GTK_MENU_SHELL(submenu), rmdupst_item); - gtk_menu_shell_append(GTK_MENU_SHELL(submenu), rmdupln_item); - gtk_menu_shell_append(GTK_MENU_SHELL(submenu), rmunqln_item); - gtk_menu_shell_append(GTK_MENU_SHELL(submenu), sep1); - gtk_menu_shell_append(GTK_MENU_SHELL(submenu), rmemtyln_item); - gtk_menu_shell_append(GTK_MENU_SHELL(submenu), rmwhspln_item); - gtk_menu_shell_append(GTK_MENU_SHELL(submenu), sep2); - gtk_menu_shell_append(GTK_MENU_SHELL(submenu), sortasc_item); - gtk_menu_shell_append(GTK_MENU_SHELL(submenu), sortdesc_item); - gtk_menu_item_set_submenu(GTK_MENU_ITEM(main_menu_item), submenu); + for (i = 0; i < G_N_ELEMENTS(menu_items); i++) + { + GtkWidget *item; - gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), main_menu_item); + if (! menu_items[i].label) /* separator */ + item = gtk_separator_menu_item_new(); + else + { + item = gtk_menu_item_new_with_mnemonic(_(menu_items[i].label)); + g_signal_connect(item, "activate", menu_items[i].cb_activate, NULL); + ui_add_document_sensitive(item); + } + gtk_widget_show(item); + gtk_menu_shell_append(GTK_MENU_SHELL(submenu), item); + } - g_signal_connect(rmdupst_item, "activate", G_CALLBACK(action_rmdupst_item), NULL); - g_signal_connect(rmdupln_item, "activate", G_CALLBACK(action_rmdupln_item), NULL); - g_signal_connect(rmunqln_item, "activate", G_CALLBACK(action_rmunqln_item), NULL); - g_signal_connect(rmemtyln_item, "activate", G_CALLBACK(action_rmemtyln_item), NULL); - g_signal_connect(rmwhspln_item, "activate", G_CALLBACK(action_rmwhspln_item), NULL); - g_signal_connect(sortasc_item, "activate", G_CALLBACK(action_sortasc_item), NULL); - g_signal_connect(sortdesc_item, "activate", G_CALLBACK(action_sortdesc_item), NULL); - - ui_add_document_sensitive(rmdupst_item); - ui_add_document_sensitive(rmdupln_item); - ui_add_document_sensitive(rmunqln_item); - ui_add_document_sensitive(rmemtyln_item); - ui_add_document_sensitive(rmwhspln_item); - ui_add_document_sensitive(sortasc_item); - ui_add_document_sensitive(sortdesc_item); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(main_menu_item), submenu); + gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), main_menu_item); return TRUE; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 024137: lineoperations: cleaned up README file
by Sylvan Mostert 17 Jan '16

17 Jan '16

Branch: refs/heads/master Author: Sylvan Mostert <smostert.dev(a)gmail.com> Committer: Sylvan Mostert <smostert.dev(a)gmail.com> Date: Sun, 17 Jan 2016 04:09:22 UTC Commit: 0241373df0a23f9ff530cdb857deade5d25bbf3e https://github.com/geany/geany-plugins/commit/0241373df0a23f9ff530cdb857dea… Log Message: ----------- lineoperations: cleaned up README file Modified Paths: -------------- lineoperations/README Modified: lineoperations/README 82 lines changed, 39 insertions(+), 43 deletions(-) =================================================================== @@ -1,12 +1,14 @@ =============== Line Operations =============== + .. contents:: About ===== -Line Operations is an assortment of simple line functions that can be applied to an open file. +Line Operations is an assortment of simple line functions that can be +applied to an open file. Features ======== @@ -22,22 +24,16 @@ Features Usage ===== -After the plugins has been installed successfully, load the plugin via Geany's plugin manager and a new menu item in the Tools menu will appear. Click on each menu item to apply the operation on whole file. See descriptions below to see operations for each menu item. +After the plugins has been installed successfully, load the plugin via +Geany's plugin manager and a new menu item in the Tools menu will +appear. Click on each menu item to apply the operation on whole file. +See descriptions below to see operations for each menu item. Notes ----- -1. Line Operations will **not** make changes to a file until you save the file. - -2. New line characters are considered to be part of the line. If the last line does not contain new line characters it will be considered different from a line with new line character(s). - - Example:: - - line 1 - - is not the same as:: - - line 1\r\n + * Line Operations will **not** make changes to a file until you save + the file. Operation Details @@ -46,9 +42,13 @@ Operation Details Remove Duplicate Lines ---------------------- -The first occurrence of each duplicate line will remain in the file. The **Sorted** option will sort the file and remove duplicate lines [fast]. The **Ordered** option will keep the same order of lines [slow]. +The first occurrence of each duplicate line will remain in the file. +The **Sorted** option will sort the file and remove duplicate lines +[fast on large files]. The **Ordered** option will keep the same order +of lines [slow on large files]. - Example: Suppose a file has the following lines. (#comments added for clarity) + Example: Suppose a file has the following lines. (#comments added for + clarity) :: @@ -67,7 +67,8 @@ The first occurrence of each duplicate line will remain in the file. The **Sorte Line 2 Line 3 - The **Remove Duplicate Lines, ordered** will change the file into this: + The **Remove Duplicate Lines, ordered** will change the file into + this: :: @@ -82,7 +83,8 @@ Remove Unique Lines Removes all lines that appear only once. - Example: Suppose a file has the following lines. (#comments added for clarity) + Example: Suppose a file has the following lines. (#comments added for + clarity) :: @@ -106,9 +108,11 @@ Removes all lines that appear only once. Remove Empty Lines ------------------ -Removes all lines that end with a newline character(s) AND do not have any other characters. +Removes all lines that only contain a newline character, and no other +characters. - Example: Suppose a file has the following lines. (#comments, and \n newline characters added for clarity) + Example: Suppose a file has the following lines. (#comments, and + \\n newline characters added for clarity) :: @@ -119,7 +123,7 @@ Removes all lines that end with a newline character(s) AND do not have any other Line 1\n Line 2\n - The **Remove Unique Lines** will change the file into this: + The **Remove Empty Lines** will change the file into this: :: @@ -133,18 +137,11 @@ Removes all lines that end with a newline character(s) AND do not have any other Remove Whitespace Lines ----------------------- -Removes all lines that have only white space characters. - -A **whitespace character** is one of: +Removes all lines that have only whitespace characters. -1. `' '` : space -2. `'\t'`: horizontal tab -3. `'\f'`: form feed -4. `'\v'`: vertical tab -5. `'\r'`: cartridge return -6. `'\n'`: newline character - Example: Suppose a file has the following lines. (#comments, and \n newline characters added for clarity) + Example: Suppose a file has the following lines. (#comments, and \\n + newline characters added for clarity) :: @@ -156,7 +153,7 @@ A **whitespace character** is one of: Line 1\n #NOT removed (contains non whitespace chars) Line 2\n - The **Remove Unique Lines** will change the file into this: + The **Remove Whitespace Lines** will change the file into this: :: @@ -168,7 +165,8 @@ A **whitespace character** is one of: Sort Lines ---------- -Sorts lines ascending or descending based on ASCII values (lexicographic sort) +Sorts lines ascending or descending based on ASCII values +(lexicographic sort). Example: Suppose a file has the following lines. @@ -206,21 +204,19 @@ Sorts lines ascending or descending based on ASCII values (lexicographic sort) License ======= -The Line Operations plugin is distributed under the terms of the -GNU General Public License as published by the Free Software Foundation; -either version 2 of the License, or (at your option) any later version. -A copy of this license can be found in the file COPYING included with the -source code of this program. +The Line Operations plugin is distributed under the terms of the GNU +General Public License as published by the Free Software Foundation; +either version 2 of the License, or (at your option) any later version. +A copy of this license can be found in the file COPYING included with +the source code of this program. Ideas, questions, patches and bug reports ========================================= -Please direct all questions, bug reports and patches to the plugin author using the -email address listed below or to the Geany mailing list to get some help from other -Geany users. - - -or report them at https://github.com/geany/geany-plugins/issues. +Please direct all questions, bug reports and patches to the plugin +author using the email address listed below or to the Geany mailing +list to get some help from other Geany users, or report them at +https://github.com/geany/geany-plugins/issues. -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 5cd5c4: lineoperations: add translatable plugin info
by Sylvan Mostert 17 Jan '16

17 Jan '16

1 0

[geany/geany-plugins] 2c2cfa: lineoperations: switched functions in rmwhspln()
by Sylvan Mostert 17 Jan '16

17 Jan '16

Branch: refs/heads/master Author: Sylvan Mostert <smostert.dev(a)gmail.com> Committer: Sylvan Mostert <smostert.dev(a)gmail.com> Date: Sun, 17 Jan 2016 04:05:36 UTC Commit: 2c2cface2512bbc57ffa615e24fce75782fd5a34 https://github.com/geany/geany-plugins/commit/2c2cface2512bbc57ffa615e24fce… Log Message: ----------- lineoperations: switched functions in rmwhspln() Switched `sci_get_line_indentation()` to `SCI_GETLINEINDENTPOSITION`. Modified Paths: -------------- lineoperations/src/linefunctions.c Modified: lineoperations/src/linefunctions.c 16 lines changed, 11 insertions(+), 5 deletions(-) =================================================================== @@ -252,18 +252,23 @@ void rmemtyln(GeanyDocument *doc) { /* Remove Whitespace Lines */ void rmwhspln(GeanyDocument *doc) { gint total_num_lines; /* number of lines in the document */ + gint indent; gint i; /* iterator */ total_num_lines = sci_get_line_count(doc->editor->sci); - + sci_start_undo_action(doc->editor->sci); for(i = 0; i < total_num_lines; i++) /* loop through opened doc */ { - - if(sci_get_line_end_position(doc->editor->sci, i) - - sci_get_position_from_line(doc->editor->sci, i) == - sci_get_line_indentation(doc->editor->sci, i)) + indent = scintilla_send_message(doc->editor->sci, + SCI_GETLINEINDENTPOSITION, + i, 0); + + if(indent - + sci_get_position_from_line(doc->editor->sci, i) == + sci_get_line_end_position(doc->editor->sci, i)- + sci_get_position_from_line(doc->editor->sci, i)) { scintilla_send_message(doc->editor->sci, SCI_DELETERANGE, @@ -275,6 +280,7 @@ void rmwhspln(GeanyDocument *doc) { } + sci_end_undo_action(doc->editor->sci); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 1477a8: ProjectOrganizer: don't unnecessarily require too new glib API
by Jiří Techet 16 Jan '16

16 Jan '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sat, 16 Jan 2016 22:43:31 UTC Commit: 1477a809d5d588405978cba68d521c6208a5326e https://github.com/geany/geany-plugins/commit/1477a809d5d588405978cba68d521… Log Message: ----------- ProjectOrganizer: don't unnecessarily require too new glib API Modified Paths: -------------- projectorganizer/src/prjorg-project.c Modified: projectorganizer/src/prjorg-project.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -79,7 +79,7 @@ static GSList *get_file_list(const gchar *utf8_path, GSList *patterns, gchar *real_path = tm_get_real_path(locale_path); dir = g_dir_open(locale_path, 0, NULL); - if (!dir || !real_path || g_hash_table_contains(visited_paths, real_path)) + if (!dir || !real_path || g_hash_table_lookup(visited_paths, real_path)) { g_free(locale_path); g_free(real_path); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 6159a7: lineoperations: fixed last newline, empty doc problems
by Sylvan Mostert 16 Jan '16

16 Jan '16

Branch: refs/heads/master Author: Sylvan Mostert <smostert.dev(a)gmail.com> Committer: Sylvan Mostert <smostert.dev(a)gmail.com> Date: Sat, 16 Jan 2016 00:46:11 UTC Commit: 6159a7362a5eca9f3511b8435a01d5d9cb145f2e https://github.com/geany/geany-plugins/commit/6159a7362a5eca9f3511b8435a01d… Log Message: ----------- lineoperations: fixed last newline, empty doc problems Added `ensure_final_newline()` to add a newline if it does not exist before operation. If the final line does not have an newline, and it shifts position, the resulting line will be concatenation of two lines. Added null terminating character to new_file string in case of empty file. Modified Paths: -------------- lineoperations/src/linefunctions.c Modified: lineoperations/src/linefunctions.c 35 lines changed, 35 insertions(+), 0 deletions(-) =================================================================== @@ -22,6 +22,20 @@ #include "linefunctions.h" +/* altered from geany/src/editor.c, ensure new line at file end */ +static void ensure_final_newline(GeanyEditor *editor, gint max_lines) +{ + gint end_document = sci_get_position_from_line(editor->sci, max_lines); + gboolean append_newline = end_document > + sci_get_position_from_line(editor->sci, max_lines - 1); + + if (append_newline) + { + const gchar *eol = editor_get_eol_char(editor); + sci_insert_text(editor->sci, end_document, eol); + } +} + /* comparison function to be used in qsort */ static gint compare_asc(const void * a, const void * b) { @@ -50,9 +64,15 @@ void rmdupst(GeanyDocument *doc) { total_num_lines = sci_get_line_count(doc->editor->sci); lines = g_malloc(sizeof(gchar *) * total_num_lines); new_file = g_malloc(sizeof(gchar) * (total_num_chars+1)); + new_file[0] = '\0'; nf_end = new_file; lineptr = (gchar *)""; + + /* if file is not empty, ensure that the file ends with newline */ + if(total_num_lines != 1) + ensure_final_newline(doc->editor, total_num_lines); + /* copy *all* lines into **lines array */ for(i = 0; i < total_num_lines; i++) lines[i] = sci_get_line(doc->editor->sci, i); @@ -94,9 +114,13 @@ void rmdupln(GeanyDocument *doc) { total_num_lines = sci_get_line_count(doc->editor->sci); lines = g_malloc(sizeof(gchar *) * total_num_lines); new_file = g_malloc(sizeof(gchar) * (total_num_chars+1)); + new_file[0] = '\0'; nf_end = new_file; + /* if file is not empty, ensure that the file ends with newline */ + if(total_num_lines != 1) + ensure_final_newline(doc->editor, total_num_lines); /* copy *all* lines into **lines array */ for(i = 0; i < total_num_lines; i++) @@ -149,8 +173,14 @@ void rmunqln(GeanyDocument *doc) { total_num_lines = sci_get_line_count(doc->editor->sci); lines = g_malloc(sizeof(gchar *) * total_num_lines); new_file = g_malloc(sizeof(gchar) * (total_num_chars+1)); + new_file[0] = '\0'; nf_end = new_file; + + /* if file is not empty, ensure that the file ends with newline */ + if(total_num_lines != 1) + ensure_final_newline(doc->editor, total_num_lines); + /* copy *all* lines into **lines array */ for(i = 0; i < total_num_lines; i++) lines[i] = sci_get_line(doc->editor->sci, i); @@ -261,6 +291,11 @@ void sortlines(GeanyDocument *doc, gboolean asc) { total_num_lines = sci_get_line_count(doc->editor->sci); lines = g_malloc(sizeof(gchar *) * total_num_lines+1); new_file = g_malloc(sizeof(gchar) * (total_num_chars+1)); + new_file[0] = '\0'; + + /* if file is not empty, ensure that the file ends with newline */ + if(total_num_lines != 1) + ensure_final_newline(doc->editor, total_num_lines); /* copy *all* lines into **lines array */ for(i = 0; i < total_num_lines; i++) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 2e2e04: lineoperations: changed g_strcmp0() to strcmp()
by Sylvan Mostert 15 Jan '16

15 Jan '16

Branch: refs/heads/master Author: Sylvan Mostert <smostert.dev(a)gmail.com> Committer: Sylvan Mostert <smostert.dev(a)gmail.com> Date: Fri, 15 Jan 2016 22:51:45 UTC Commit: 2e2e043318fd2630cd05f1ee95c49fcdb019b6f7 https://github.com/geany/geany-plugins/commit/2e2e043318fd2630cd05f1ee95c49… Log Message: ----------- lineoperations: changed g_strcmp0() to strcmp() Modified Paths: -------------- lineoperations/src/linefunctions.c lineoperations/src/linefunctions.h Modified: lineoperations/src/linefunctions.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -25,14 +25,14 @@ /* comparison function to be used in qsort */ static gint compare_asc(const void * a, const void * b) { - return g_strcmp0(*(const gchar **) a, *(const gchar **) b); + return strcmp(*(const gchar **) a, *(const gchar **) b); } /* comparison function to be used in qsort */ static gint compare_desc(const void * a, const void * b) { - return g_strcmp0(*(const gchar **) b, *(const gchar **) a); + return strcmp(*(const gchar **) b, *(const gchar **) a); } @@ -176,7 +176,7 @@ void rmunqln(GeanyDocument *doc) { /* copy **lines into 'new_file' if it is not FALSE(not duplicate) */ for(i = 0; i < total_num_lines; i++) if(!to_remove[i]) - nf_end = g_stpcpy(nf_end, lines[i]); + nf_end = g_stpcpy(nf_end, lines[i]); /* set new document */ sci_set_text(doc->editor->sci, new_file); Modified: lineoperations/src/linefunctions.h 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -25,8 +25,8 @@ #include "geanyplugin.h" #include "Scintilla.h" -//#include <ctype.h> /* isspace */ -#include <stdlib.h> /* qsort */ +#include <stdlib.h> /* qsort */ +#include <string.h> /* Remove Duplicate Lines, sorted */ -------------- 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

Plugins-Commits January 2016