Plugins-Commits January 2017

plugins-commits@lists.geany.org

1 participants
19 discussions

[geany/geany-plugins] f0fa9e: lineoperations: added selection support
by Sylvan Mostert 03 Jan '17

03 Jan '17

Branch: refs/heads/master Author: Sylvan Mostert <smostert.dev(a)gmail.com> Committer: Sylvan Mostert <smostert.dev(a)gmail.com> Date: Fri, 09 Sep 2016 05:45:32 UTC Commit: f0fa9e8c150b36ae6b1be241299ad70266cf5367 https://github.com/geany/geany-plugins/commit/f0fa9e8c150b36ae6b1be241299ad… Log Message: ----------- lineoperations: added selection support If there is a selection, the Operation will be applied to the lines in the selection, and if there is no selection, the Operation will be applied to the whole file. Adjusted `rmemtyln` and `rmwhspln` to accept first line and end line for selection. Modified Paths: -------------- lineoperations/src/linefunctions.c lineoperations/src/linefunctions.h lineoperations/src/lineoperations.c Modified: lineoperations/src/linefunctions.c 219 lines changed, 62 insertions(+), 157 deletions(-) =================================================================== @@ -22,21 +22,6 @@ #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) { @@ -52,235 +37,155 @@ static gint compare_desc(const void * a, const void * b) /* Remove Duplicate Lines, sorted */ -void rmdupst(GeanyDocument *doc) { - gint total_num_chars; /* number of characters in the document */ - gint total_num_lines; /* number of lines in the document */ - gchar **lines; /* array to hold all lines in the document */ - gchar *new_file; /* *final* string to replace current document */ - gchar *nf_end; /* points to end of new_file */ - gchar *lineptr; /* temporary line pointer */ - gint i; /* iterator */ - - 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); - 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); +void +rmdupst(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file) +{ + gchar *nf_end = new_file; /* points to last char of new_file */ + gchar *lineptr = (gchar *)""; /* temporary line pointer */ + gint i = 0; /* iterator */ /* sort **lines ascending */ - qsort(lines, total_num_lines, sizeof(gchar *), compare_asc); + qsort(lines, num_lines, sizeof(gchar *), compare_asc); /* loop through **lines, join first occurances into one str (new_file) */ - for(i = 0; i < total_num_lines; i++) + for(i = 0; i < num_lines; i++) + { if(strcmp(lines[i], lineptr) != 0) { lineptr = lines[i]; nf_end = g_stpcpy(nf_end, lines[i]); } - - /* set new document */ - sci_set_text(doc->editor->sci, new_file); - - /* free used memory */ - for(i = 0; i < total_num_lines; i++) - g_free(lines[i]); - g_free(lines); - g_free(new_file); + } } /* Remove Duplicate Lines, ordered */ -void rmdupln(GeanyDocument *doc) { - gint total_num_chars; /* number of characters in the document */ - gint total_num_lines; /* number of lines in the document */ - gchar **lines; /* array to hold all lines in the document */ - gchar *new_file; /* *final* string to replace current document */ - gchar *nf_end; /* points to end of new_file */ - gint i; /* iterator */ - gint j; /* iterator */ - gboolean *to_remove; /* flag to 'mark' which lines to remove */ - - 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); - 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); +void +rmdupln(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file) +{ + gchar *nf_end = new_file; /* points to last char of new_file */ + gint i = 0; /* iterator */ + gint j = 0; /* iterator */ + gboolean *to_remove = NULL; /* flag to 'mark' which lines to remove */ + /* allocate and set *to_remove to all FALSE * to_remove[i] represents whether lines[i] should be removed */ - to_remove = g_malloc(sizeof(gboolean) * total_num_lines); - for(i = 0; i < (total_num_lines); i++) + to_remove = g_malloc(sizeof(gboolean) * num_lines); + for(i = 0; i < (num_lines); i++) to_remove[i] = FALSE; /* find which **lines are duplicate, and mark them as duplicate */ - for(i = 0; i < total_num_lines; i++) /* loop through **lines */ + for(i = 0; i < num_lines; i++) /* loop through **lines */ + { /* make sure that the line is not already duplicate */ if(!to_remove[i]) + { /* find the rest of same lines */ - for(j = (i+1); j < total_num_lines; j++) + for(j = (i+1); j < num_lines; j++) + { if(!to_remove[j] && strcmp(lines[i], lines[j]) == 0) to_remove[j] = TRUE; /* line is duplicate, mark to remove */ + } + } + } /* copy **lines into 'new_file' if it is not FALSE(not duplicate) */ - for(i = 0; i < total_num_lines; i++) + for(i = 0; i < num_lines; i++) if(!to_remove[i]) nf_end = g_stpcpy(nf_end, lines[i]); - /* set new document */ - sci_set_text(doc->editor->sci, new_file); - /* free used memory */ - for(i = 0; i < total_num_lines; i++) - g_free(lines[i]); - g_free(lines); - g_free(new_file); g_free(to_remove); } /* Remove Unique Lines */ -void rmunqln(GeanyDocument *doc) { - gint total_num_chars; /* number of characters in the document */ - gint total_num_lines; /* number of lines in the document */ - gchar **lines; /* array to hold all lines in the document */ - gchar *new_file; /* *final* string to replace current document */ - gchar *nf_end; /* points to end of new_file */ - gint i; /* iterator */ - gint j; /* iterator */ - gboolean *to_remove; /* to 'mark' which lines to remove */ - - 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); - 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); +void +rmunqln(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file) +{ + gchar *nf_end = new_file; /* points to last char of new_file */ + gint i = 0; /* iterator */ + gint j = 0; /* iterator */ + gboolean *to_remove = NULL; /* to 'mark' which lines to remove */ /* allocate and set *to_remove to all TRUE * to_remove[i] represents whether lines[i] should be removed */ - to_remove = g_malloc(sizeof(gboolean) * total_num_lines); - for(i = 0; i < total_num_lines; i++) + to_remove = g_malloc(sizeof(gboolean) * num_lines); + for(i = 0; i < num_lines; i++) to_remove[i] = TRUE; /* find all unique lines and set them to FALSE (not to be removed) */ - for(i = 0; i < total_num_lines; i++) + for(i = 0; i < num_lines; i++) /* make sure that the line is not already determined to be unique */ if(to_remove[i]) - for(j = (i+1); j < total_num_lines; j++) + for(j = (i+1); j < num_lines; j++) if(to_remove[j] && strcmp(lines[i], lines[j]) == 0) { to_remove[i] = FALSE; to_remove[j] = FALSE; } /* copy **lines into 'new_file' if it is not FALSE(not duplicate) */ - for(i = 0; i < total_num_lines; i++) + for(i = 0; i < num_lines; i++) if(!to_remove[i]) nf_end = g_stpcpy(nf_end, lines[i]); - /* set new document */ - sci_set_text(doc->editor->sci, new_file); - /* free used memory */ - for(i = 0; i < total_num_lines; i++) - g_free(lines[i]); - g_free(lines); - g_free(new_file); g_free(to_remove); } /* Remove Empty Lines */ -void rmemtyln(GeanyDocument *doc) { - gint total_num_lines; /* number of lines in the document */ - gint i; /* iterator */ - - total_num_lines = sci_get_line_count(doc->editor->sci); - - sci_start_undo_action(doc->editor->sci); +void +rmemtyln(GeanyDocument *doc, gint line_num, gint end_line_num) +{ - for(i = 0; i < total_num_lines; i++) /* loop through opened doc */ + while(line_num <= end_line_num) /* loop through lines */ { + /* check if the first posn of the line is also the end of line posn */ if(sci_get_position_from_line(doc->editor->sci, i) == 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)); - total_num_lines--; - i--; + SCI_DELETERANGE, + sci_get_position_from_line(doc->editor->sci, line_num), + sci_get_line_length(doc->editor->sci, line_num)); + line_num--; + end_line_num--; } } - - sci_end_undo_action(doc->editor->sci); } /* 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); +void +rmwhspln(GeanyDocument *doc, gint line_num, gint end_line_num) +{ + gint indent; /* indent position */ - for(i = 0; i < total_num_lines; i++) /* loop through opened doc */ + while(line_num <= end_line_num) /* loop through lines */ { indent = scintilla_send_message(doc->editor->sci, SCI_GETLINEINDENTPOSITION, i, 0); + /* check if the posn of indentation is also the end of line posn */ 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, - sci_get_position_from_line(doc->editor->sci, i), - sci_get_line_length(doc->editor->sci, i)); - total_num_lines--; - i--; + SCI_DELETERANGE, + sci_get_position_from_line(doc->editor->sci, line_num), + sci_get_line_length(doc->editor->sci, line_num)); + line_num--; + end_line_num--; } } - - - sci_end_undo_action(doc->editor->sci); } Modified: lineoperations/src/linefunctions.h 25 lines changed, 17 insertions(+), 8 deletions(-) =================================================================== @@ -1,5 +1,6 @@ /* - * linefunctions.h - Line operations, remove duplicate lines, empty lines, lines with only whitespace, sort lines. + * linefunctions.h - Line operations, remove duplicate lines, empty lines, + * lines with only whitespace, sort lines. * * Copyright 2015 Sylvan Mostert <smostert.dev(a)gmail.com> * @@ -30,29 +31,37 @@ /* Remove Duplicate Lines, sorted */ -void rmdupst(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file); +void +rmdupst(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file); /* Remove Duplicate Lines, ordered */ -void rmdupln(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file); +void +rmdupln(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file); /* Remove Unique Lines */ -void rmunqln(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file); +void +rmunqln(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file); /* Remove Empty Lines */ -void rmemtyln(GeanyDocument *doc, gint num_lines); +void +rmemtyln(GeanyDocument *doc, gint line_num, gint end_line_num); /* Remove Whitespace Lines */ -void rmwhspln(GeanyDocument *doc, gint num_lines); +void +rmwhspln(GeanyDocument *doc, gint line_num, gint end_line_num); /* Sort Lines Ascending */ -void sortlinesasc(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file); +void +sortlnsasc(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file); + /* Sort Lines Descending */ -void sortlinesdesc(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file); +void +sortlndesc(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file); #endif Modified: lineoperations/src/lineoperations.c 148 lines changed, 119 insertions(+), 29 deletions(-) =================================================================== @@ -1,5 +1,6 @@ /* - * lineoperations.c - Line operations, remove duplicate lines, empty lines, lines with only whitespace, sort lines. + * lineoperations.c - Line operations, remove duplicate lines, empty lines, + * lines with only whitespace, sort lines. * * Copyright 2015 Sylvan Mostert <smostert.dev(a)gmail.com> * @@ -30,12 +31,74 @@ static GtkWidget *main_menu_item = NULL; +/* represents lines that will have Operation applied to */ +struct lo_lines { + gboolean is_selection; + gint start_posn_line; + gint end_posn_line; +}; + + +/* select lines in document based on lo_lines struct parameter */ +static void +select_lines(GeanyDocument *doc, struct lo_lines sel) +{ + /* set the selection to beginning of first line */ + sci_set_selection_start(doc->editor->sci, + sci_get_position_from_line(doc->editor->sci, sel.start_posn_line)); + + /* set the selection to end of last line */ + sci_set_selection_end(doc->editor->sci, + sci_get_line_end_position(doc->editor->sci, sel.end_posn_line) + + editor_get_eol_char_len(doc->editor)); +} + + +/* get lo_lines struct based off of document */ +static struct lo_lines +get_current_sel_lines(GeanyDocument *doc) +{ + struct lo_lines sel = { 0, 0 }; + gint start_posn = 0; /* position of selection start */ + gint end_posn = 0; /* position of selection end */ + + /* check for selection */ + if(sci_has_selection(doc->editor->sci)) + { + /* get the start and end positions */ + start_posn = sci_get_selection_start(doc->editor->sci); + end_posn = sci_get_selection_end (doc->editor->sci); + + /* get the line number of those positions */ + sel.start_posn_line = scintilla_send_message(doc->editor->sci, + SCI_LINEFROMPOSITION, + start_posn, 0); + + sel.end_posn_line = scintilla_send_message(doc->editor->sci, + SCI_LINEFROMPOSITION, + end_posn, 0); + + sel.is_selection = TRUE; + } + else + { + /* if there is no selection, start at first line */ + sel.start_posn_line = 0; + /* and end at last one */ + sel.end_posn_line = (sci_get_line_count(doc->editor->sci) - 1); + + sel.is_selection = FALSE; + } + + return sel; +} + /* 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); + 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); @@ -47,38 +110,57 @@ ensure_final_newline(GeanyEditor *editor, gint max_lines) } -/* - * functions with indirect scintilla manipulation - * e.g. requires **lines array, *new_file... +/* + * Menu action for functions with indirect scintilla manipulation + * e.g. functions requiring **lines array, *new_file... */ static void action_indir_manip_item(GtkMenuItem *menuitem, gpointer gdata) { - void (*func)(GeanyDocument *, gchar **, gint, gchar *) = gdata; - GeanyDocument *doc = document_get_current(); - - gint num_chars = sci_get_length(doc->editor->sci); - gint num_lines = sci_get_line_count(doc->editor->sci); - gchar **lines = g_malloc(sizeof(gchar *) * num_lines); - gchar *new_file = g_malloc(sizeof(gchar) * (num_chars+1)); - gint i = 0; + /* function pointer to gdata -- function to be used */ + void (*func)(GeanyDocument * doc, + gchar **lines, + gint num_lines, + gchar *new_file) = gdata; + + GeanyDocument *doc = document_get_current(); + struct lo_lines sel = get_current_sel_lines(doc); + gint num_chars = 0; + gint num_lines = (sel.end_posn_line - sel.start_posn_line) + 1; + gchar **lines = g_malloc(sizeof(gchar *) * num_lines); + gint i = 0; + + /* get num_chars and **lines */ + for(i = 0; i < num_lines; i++) + { + num_chars += (sci_get_line_length(doc->editor->sci, + (i + sel.start_posn_line))); + lines[i] = sci_get_line(doc->editor->sci, + (i + sel.start_posn_line)); + } + + gchar *new_file = g_malloc(sizeof(gchar) * (num_chars + 1)); new_file[0] = '\0'; - - /* copy *all* lines into **lines array */ - for(i = 0; i < num_lines; i++) - lines[i] = sci_get_line(doc->editor->sci, i); + /* select lines to indicate to user what lines were altered */ + select_lines(doc, sel); sci_start_undo_action(doc->editor->sci); /* if file is not empty, ensure that the file ends with newline */ - if(num_lines != 1) + if((!sel.is_selection && num_lines != 1) || (sel.is_selection && + sel.end_posn_line == (sci_get_line_count(doc->editor->sci) - 1))) + { ensure_final_newline(doc->editor, num_lines); + } if(doc) func(doc, lines, num_lines, new_file); /* set new document */ - sci_set_text(doc->editor->sci, new_file); + if(sci_has_selection(doc->editor->sci)) + sci_replace_sel(doc->editor->sci, new_file); + else + sci_set_text(doc->editor->sci, new_file); sci_end_undo_action(doc->editor->sci); @@ -90,21 +172,25 @@ action_indir_manip_item(GtkMenuItem *menuitem, gpointer gdata) } -/* - * functions with direct scintilla manipulation + +/* + * Menu action for functions with direct scintilla manipulation * e.g. no need for **lines array, *new_file... */ static void action_sci_manip_item(GtkMenuItem *menuitem, gpointer gdata) { - void (*func)(GeanyDocument *, gint) = gdata; - GeanyDocument *doc = document_get_current(); + /* function pointer to gdata -- function to be used */ + void (*func)(GeanyDocument *, gint, gint) = gdata; + GeanyDocument *doc = document_get_current(); + struct lo_lines sel = get_current_sel_lines(doc); - gint num_lines = sci_get_line_count(doc->editor->sci); + /* select lines to indicate to user what lines were altered */ + select_lines(doc, sel); sci_start_undo_action(doc->editor->sci); - if(doc) func(doc, num_lines); + if(doc) func(doc, sel.start_posn_line, sel.end_posn_line); sci_end_undo_action(doc->editor->sci); } @@ -135,9 +221,9 @@ lo_init(GeanyPlugin *plugin, gpointer gdata) G_CALLBACK(action_sci_manip_item), (gpointer) rmwhspln }, { NULL }, { N_("Sort Lines _Ascending"), - G_CALLBACK(action_indir_manip_item), (gpointer) sortlinesasc }, + G_CALLBACK(action_indir_manip_item), (gpointer) sortlnsasc }, { N_("Sort Lines _Descending"), - G_CALLBACK(action_indir_manip_item), (gpointer) sortlinesdesc } + G_CALLBACK(action_indir_manip_item), (gpointer) sortlndesc } }; main_menu_item = gtk_menu_item_new_with_mnemonic(_("_Line Operations")); @@ -155,7 +241,10 @@ 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, menu_items[i].cb_data); + g_signal_connect(item, + "activate", + menu_items[i].cb_activate, + menu_items[i].cb_data); ui_add_document_sensitive(item); } @@ -164,7 +253,8 @@ lo_init(GeanyPlugin *plugin, gpointer gdata) } 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); + 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] 465ffe: lineoperations: added selection to documentation
by Sylvan Mostert 03 Jan '17

03 Jan '17

Branch: refs/heads/master Author: Sylvan Mostert <smostert.dev(a)gmail.com> Committer: Sylvan Mostert <smostert.dev(a)gmail.com> Date: Fri, 09 Sep 2016 05:47:12 UTC Commit: 465ffebc589ee33caf50462b22a2d0bac92c1004 https://github.com/geany/geany-plugins/commit/465ffebc589ee33caf50462b22a2d… Log Message: ----------- lineoperations: added selection to documentation Bumped version number to 0.2. Added information to ChangeLog. Modified Paths: -------------- lineoperations/ChangeLog lineoperations/README lineoperations/src/lineoperations.c Modified: lineoperations/ChangeLog 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,6 @@ +2016-02-27 Sylvan Mostert <smostert.dev(a)gmail.com> + + * added selection support + + + Modified: lineoperations/README 14 lines changed, 11 insertions(+), 3 deletions(-) =================================================================== @@ -8,7 +8,7 @@ About ===== Line Operations is an assortment of simple line functions that can be -applied to an open file. +applied to an open file, or selection. Features ======== @@ -26,8 +26,16 @@ 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. +appear. Click on each menu item to apply the operation on whole file, or +selection. See descriptions below to see operations for each menu item. + +Selection +--------- + +If a selection is made in the file, the line operation will be applied to the +lines within the selection. The beginning of the selection will expand to the +beginning of its line, and the end of the selection will expand to the end of +its line. If the end of the selection is on col 0, that line will be included. Notes ----- Modified: lineoperations/src/lineoperations.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -271,8 +271,8 @@ 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->description = _("Line Operations provides a handful of functions that can be applied to a document or selection such as, removing duplicate lines, removing empty lines, removing lines with only whitespace, and sorting lines."); + plugin->info->version = "0.2"; plugin->info->author = "Sylvan Mostert <smostert.dev(a)gmail.com>"; plugin->funcs->init = lo_init; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] be20de: lineoperations: combined similar code
by Sylvan Mostert 03 Jan '17

03 Jan '17

Branch: refs/heads/master Author: Sylvan Mostert <smostert.dev(a)gmail.com> Committer: Sylvan Mostert <smostert.dev(a)gmail.com> Date: Fri, 09 Sep 2016 05:43:53 UTC Commit: be20ded4e8adbf85833cc8cc6368351189ff5516 https://github.com/geany/geany-plugins/commit/be20ded4e8adbf85833cc8cc63683… Log Message: ----------- lineoperations: combined similar code Repeated variable declarations in each function (in linefunctions.c) are now passed in. Repeated code is now in `lineoperations.c` in `action_sci_manip_item()` and `action_indir_manip_item()`. The `sortlines()` function is now split into ascending and descending -- to remove extra gboolean flag parameter. Added undo action to include `ensure_final_newline()`. Modified Paths: -------------- lineoperations/src/linefunctions.c lineoperations/src/linefunctions.h lineoperations/src/lineoperations.c Modified: lineoperations/src/linefunctions.c 47 lines changed, 17 insertions(+), 30 deletions(-) =================================================================== @@ -284,40 +284,27 @@ void rmwhspln(GeanyDocument *doc) { } -/* Sort Lines Ascending and Descending */ -void sortlines(GeanyDocument *doc, gboolean asc) { - gint total_num_lines; /* number of lines in the document */ - gchar **lines; /* array to hold all lines in the document */ - gchar *new_file; /* *final* string to replace current document */ - gint i; /* iterator */ - - total_num_lines = sci_get_line_count(doc->editor->sci); - lines = g_malloc(sizeof(gchar *) * (total_num_lines+1)); +/* Sort Lines Ascending */ +void sortlinesasc(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file) { + gchar *nf_end = new_file; /* points to last char of new_file */ + gint i; - /* 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); + qsort(lines, num_lines, sizeof(gchar *), compare_asc); - /* copy *all* lines into **lines array */ - for(i = 0; i < total_num_lines; i++) - lines[i] = sci_get_line(doc->editor->sci, i); + /* join **lines into one string (new_file) */ + for(i = 0; i < num_lines; i++) + nf_end = g_stpcpy(nf_end, lines[i]); +} - /* sort **lines array */ - if(asc) - qsort(lines, total_num_lines, sizeof(gchar *), compare_asc); - else - qsort(lines, total_num_lines, sizeof(gchar *), compare_desc); - /* join **lines into one string (new_file) */ - lines[total_num_lines] = NULL; - new_file = g_strjoinv("", lines); +/* Sort Lines Descending */ +void sortlinesdesc(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file) { + gchar *nf_end = new_file; /* points to last char of new_file */ + gint i; - /* set new document */ - sci_set_text(doc->editor->sci, new_file); + qsort(lines, num_lines, sizeof(gchar *), compare_desc); - /* free used memory */ - for(i = 0; i < total_num_lines; i++) - g_free(lines[i]); - g_free(lines); - g_free(new_file); + /* join **lines into one string (new_file) */ + for(i = 0; i < num_lines; i++) + nf_end = g_stpcpy(nf_end, lines[i]); } Modified: lineoperations/src/linefunctions.h 17 lines changed, 10 insertions(+), 7 deletions(-) =================================================================== @@ -30,26 +30,29 @@ /* Remove Duplicate Lines, sorted */ -void rmdupst(GeanyDocument *doc); +void rmdupst(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file); /* Remove Duplicate Lines, ordered */ -void rmdupln(GeanyDocument *doc); +void rmdupln(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file); /* Remove Unique Lines */ -void rmunqln(GeanyDocument *doc); +void rmunqln(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file); /* Remove Empty Lines */ -void rmemtyln(GeanyDocument *doc); +void rmemtyln(GeanyDocument *doc, gint num_lines); /* Remove Whitespace Lines */ -void rmwhspln(GeanyDocument *doc); +void rmwhspln(GeanyDocument *doc, gint num_lines); -/* Sort Lines Ascending and Descending */ -void sortlines(GeanyDocument *doc, gboolean asc); +/* Sort Lines Ascending */ +void sortlinesasc(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file); + +/* Sort Lines Descending */ +void sortlinesdesc(GeanyDocument *doc, gchar **lines, gint num_lines, gchar *new_file); #endif Modified: lineoperations/src/lineoperations.c 94 lines changed, 76 insertions(+), 18 deletions(-) =================================================================== @@ -29,26 +29,84 @@ static GtkWidget *main_menu_item = NULL; -/* call custom func */ + + +/* 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); + } +} + + +/* + * functions with indirect scintilla manipulation + * e.g. requires **lines array, *new_file... +*/ static void -action_func_item(GtkMenuItem *menuitem, gpointer gdata) +action_indir_manip_item(GtkMenuItem *menuitem, gpointer gdata) { - void (*func)(GeanyDocument *) = gdata; - GeanyDocument *doc = NULL; - doc = document_get_current(); + void (*func)(GeanyDocument *, gchar **, gint, gchar *) = gdata; + GeanyDocument *doc = document_get_current(); - if(doc) func(doc); + gint num_chars = sci_get_length(doc->editor->sci); + gint num_lines = sci_get_line_count(doc->editor->sci); + gchar **lines = g_malloc(sizeof(gchar *) * num_lines); + gchar *new_file = g_malloc(sizeof(gchar) * (num_chars+1)); + gint i = 0; + new_file[0] = '\0'; + + + /* copy *all* lines into **lines array */ + for(i = 0; i < num_lines; i++) + lines[i] = sci_get_line(doc->editor->sci, i); + + sci_start_undo_action(doc->editor->sci); + + /* if file is not empty, ensure that the file ends with newline */ + if(num_lines != 1) + ensure_final_newline(doc->editor, num_lines); + + if(doc) func(doc, lines, num_lines, new_file); + + /* set new document */ + sci_set_text(doc->editor->sci, new_file); + + sci_end_undo_action(doc->editor->sci); + + /* free used memory */ + for(i = 0; i < num_lines; i++) + g_free(lines[i]); + g_free(lines); + g_free(new_file); } -/* Sort Lines */ +/* + * functions with direct scintilla manipulation + * e.g. no need for **lines array, *new_file... +*/ static void -action_sort_item(GtkMenuItem *menuitem, gpointer gdata) +action_sci_manip_item(GtkMenuItem *menuitem, gpointer gdata) { - GeanyDocument *doc = NULL; - doc = document_get_current(); + void (*func)(GeanyDocument *, gint) = gdata; + GeanyDocument *doc = document_get_current(); + + gint num_lines = sci_get_line_count(doc->editor->sci); + + sci_start_undo_action(doc->editor->sci); + + if(doc) func(doc, num_lines); - if(doc) sortlines(doc, GPOINTER_TO_INT(gdata)); + sci_end_undo_action(doc->editor->sci); } @@ -65,21 +123,21 @@ lo_init(GeanyPlugin *plugin, gpointer gdata) gpointer cb_data; } menu_items[] = { { N_("Remove Duplicate Lines, _Sorted"), - G_CALLBACK(action_func_item), (gpointer) rmdupst }, + G_CALLBACK(action_indir_manip_item), (gpointer) rmdupst }, { N_("Remove Duplicate Lines, _Ordered"), - G_CALLBACK(action_func_item), (gpointer) rmdupln }, + G_CALLBACK(action_indir_manip_item), (gpointer) rmdupln }, { N_("Remove _Unique Lines"), - G_CALLBACK(action_func_item), (gpointer) rmunqln }, + G_CALLBACK(action_indir_manip_item), (gpointer) rmunqln }, { NULL }, { N_("Remove _Empty Lines"), - G_CALLBACK(action_func_item), (gpointer) rmemtyln }, + G_CALLBACK(action_sci_manip_item), (gpointer) rmemtyln }, { N_("Remove _Whitespace Lines"), - G_CALLBACK(action_func_item), (gpointer) rmwhspln }, + G_CALLBACK(action_sci_manip_item), (gpointer) rmwhspln }, { NULL }, { N_("Sort Lines _Ascending"), - G_CALLBACK(action_sort_item), GINT_TO_POINTER(1) }, + G_CALLBACK(action_indir_manip_item), (gpointer) sortlinesasc }, { N_("Sort Lines _Descending"), - G_CALLBACK(action_sort_item), GINT_TO_POINTER(0) } + G_CALLBACK(action_indir_manip_item), (gpointer) sortlinesdesc } }; main_menu_item = gtk_menu_item_new_with_mnemonic(_("_Line Operations")); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] c563b2: Merge pull request #378 from smostertdev/lineoperations_v2
by Frank Lanitz 03 Jan '17

03 Jan '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Tue, 03 Jan 2017 21:45:58 UTC Commit: c563b20ceeac9d91d2fa77b1783262317b4b49ef https://github.com/geany/geany-plugins/commit/c563b20ceeac9d91d2fa77b178326… Log Message: ----------- Merge pull request #378 from smostertdev/lineoperations_v2 lineoperations: added selection support Modified Paths: -------------- lineoperations/ChangeLog lineoperations/README lineoperations/src/linefunctions.c lineoperations/src/linefunctions.h lineoperations/src/lineoperations.c Modified: lineoperations/ChangeLog 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,6 @@ +2016-02-27 Sylvan Mostert <smostert.dev(a)gmail.com> + + * added selection support + + + Modified: lineoperations/README 14 lines changed, 11 insertions(+), 3 deletions(-) =================================================================== @@ -8,7 +8,7 @@ About ===== Line Operations is an assortment of simple line functions that can be -applied to an open file. +applied to an open file, or selection. Features ======== @@ -26,8 +26,16 @@ 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. +appear. Click on each menu item to apply the operation on whole file, or +selection. See descriptions below to see operations for each menu item. + +Selection +--------- + +If a selection is made in the file, the line operation will be applied to the +lines within the selection. The beginning of the selection will expand to the +beginning of its line, and the end of the selection will expand to the end of +its line. If the end of the selection is on col 0, that line will be included. Notes ----- Modified: lineoperations/src/linefunctions.c 336 lines changed, 136 insertions(+), 200 deletions(-) =================================================================== @@ -1,5 +1,6 @@ /* - * linefunctions.c - Line operations, remove duplicate lines, empty lines, lines with only whitespace, sort lines. + * linefunctions.c - Line operations, remove duplicate lines, empty lines, + * lines with only whitespace, sort lines. * * Copyright 2015 Sylvan Mostert <smostert.dev(a)gmail.com> * @@ -22,302 +23,237 @@ #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) +static gint +compare_asc(const void * a, const void * 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) +static gint +compare_desc(const void * a, const void * b) { return strcmp(*(const gchar **) b, *(const gchar **) a); } /* Remove Duplicate Lines, sorted */ -void rmdupst(GeanyDocument *doc) { - gint total_num_chars; /* number of characters in the document */ - gint total_num_lines; /* number of lines in the document */ - gchar **lines; /* array to hold all lines in the document */ - gchar *new_file; /* *final* string to replace current document */ - gchar *nf_end; /* points to end of new_file */ - gchar *lineptr; /* temporary line pointer */ - gint i; /* iterator */ - - 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); - 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); +gint +rmdupst(gchar **lines, gint num_lines, gchar *new_file) +{ + gchar *nf_end = new_file; /* points to last char of new_file */ + gchar *lineptr = (gchar *)" "; /* temporary line pointer */ + gint i = 0; /* iterator */ + gint changed = 0; /* number of lines removed */ /* sort **lines ascending */ - qsort(lines, total_num_lines, sizeof(gchar *), compare_asc); + qsort(lines, num_lines, sizeof(gchar *), compare_asc); /* loop through **lines, join first occurances into one str (new_file) */ - for(i = 0; i < total_num_lines; i++) + for(i = 0; i < num_lines; i++) + { if(strcmp(lines[i], lineptr) != 0) { - lineptr = lines[i]; - nf_end = g_stpcpy(nf_end, lines[i]); + changed++; /* number of lines kept */ + lineptr = lines[i]; + nf_end = g_stpcpy(nf_end, lines[i]); } + } - /* set new document */ - sci_set_text(doc->editor->sci, new_file); - - /* free used memory */ - for(i = 0; i < total_num_lines; i++) - g_free(lines[i]); - g_free(lines); - g_free(new_file); + /* return the number of lines deleted */ + return -(num_lines - changed); } /* Remove Duplicate Lines, ordered */ -void rmdupln(GeanyDocument *doc) { - gint total_num_chars; /* number of characters in the document */ - gint total_num_lines; /* number of lines in the document */ - gchar **lines; /* array to hold all lines in the document */ - gchar *new_file; /* *final* string to replace current document */ - gchar *nf_end; /* points to end of new_file */ - gint i; /* iterator */ - gint j; /* iterator */ - gboolean *to_remove; /* flag to 'mark' which lines to remove */ - - 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); - 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); +gint +rmdupln(gchar **lines, gint num_lines, gchar *new_file) +{ + gchar *nf_end = new_file; /* points to last char of new_file */ + gint i = 0; /* iterator */ + gint j = 0; /* iterator */ + gboolean *to_remove = NULL; /* flag to 'mark' which lines to remove */ + gint changed = 0; /* number of lines removed */ + /* allocate and set *to_remove to all FALSE * to_remove[i] represents whether lines[i] should be removed */ - to_remove = g_malloc(sizeof(gboolean) * total_num_lines); - for(i = 0; i < (total_num_lines); i++) + to_remove = g_malloc(sizeof(gboolean) * num_lines); + for(i = 0; i < (num_lines); i++) to_remove[i] = FALSE; /* find which **lines are duplicate, and mark them as duplicate */ - for(i = 0; i < total_num_lines; i++) /* loop through **lines */ + for(i = 0; i < num_lines; i++) /* loop through **lines */ + { /* make sure that the line is not already duplicate */ if(!to_remove[i]) + { /* find the rest of same lines */ - for(j = (i+1); j < total_num_lines; j++) + for(j = (i+1); j < num_lines; j++) + { if(!to_remove[j] && strcmp(lines[i], lines[j]) == 0) - to_remove[j] = TRUE; /* line is duplicate, mark to remove */ + to_remove[j] = TRUE; /* line is duplicate, mark to remove */ + } + } + } - /* copy **lines into 'new_file' if it is not FALSE(not duplicate) */ - for(i = 0; i < total_num_lines; i++) + /* copy **lines into 'new_file' if it is not FALSE (not duplicate) */ + for(i = 0; i < num_lines; i++) if(!to_remove[i]) - nf_end = g_stpcpy(nf_end, lines[i]); - - /* set new document */ - sci_set_text(doc->editor->sci, new_file); + { + changed++; /* number of lines kept */ + nf_end = g_stpcpy(nf_end, lines[i]); + } /* free used memory */ - for(i = 0; i < total_num_lines; i++) - g_free(lines[i]); - g_free(lines); - g_free(new_file); g_free(to_remove); + + /* return the number of lines deleted */ + return -(num_lines - changed); } /* Remove Unique Lines */ -void rmunqln(GeanyDocument *doc) { - gint total_num_chars; /* number of characters in the document */ - gint total_num_lines; /* number of lines in the document */ - gchar **lines; /* array to hold all lines in the document */ - gchar *new_file; /* *final* string to replace current document */ - gchar *nf_end; /* points to end of new_file */ - gint i; /* iterator */ - gint j; /* iterator */ - gboolean *to_remove; /* to 'mark' which lines to remove */ - - 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); - 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); +gint +rmunqln(gchar **lines, gint num_lines, gchar *new_file) +{ + gchar *nf_end = new_file; /* points to last char of new_file */ + gint i = 0; /* iterator */ + gint j = 0; /* iterator */ + gboolean *to_remove = NULL; /* to 'mark' which lines to remove */ + gint changed = 0; /* number of lines removed */ /* allocate and set *to_remove to all TRUE * to_remove[i] represents whether lines[i] should be removed */ - to_remove = g_malloc(sizeof(gboolean) * total_num_lines); - for(i = 0; i < total_num_lines; i++) + to_remove = g_malloc(sizeof(gboolean) * num_lines); + for(i = 0; i < num_lines; i++) to_remove[i] = TRUE; /* find all unique lines and set them to FALSE (not to be removed) */ - for(i = 0; i < total_num_lines; i++) + for(i = 0; i < num_lines; i++) /* make sure that the line is not already determined to be unique */ if(to_remove[i]) - for(j = (i+1); j < total_num_lines; j++) + for(j = (i+1); j < num_lines; j++) if(to_remove[j] && strcmp(lines[i], lines[j]) == 0) { to_remove[i] = FALSE; to_remove[j] = FALSE; } /* copy **lines into 'new_file' if it is not FALSE(not duplicate) */ - for(i = 0; i < total_num_lines; i++) + for(i = 0; i < num_lines; i++) if(!to_remove[i]) + { + changed++; /* number of lines kept */ nf_end = g_stpcpy(nf_end, lines[i]); - - /* set new document */ - sci_set_text(doc->editor->sci, new_file); + } /* free used memory */ - for(i = 0; i < total_num_lines; i++) - g_free(lines[i]); - g_free(lines); - g_free(new_file); g_free(to_remove); + + /* return the number of lines deleted */ + return -(num_lines - changed); } /* Remove Empty Lines */ -void rmemtyln(GeanyDocument *doc) { - gint total_num_lines; /* number of lines in the document */ - gint i; /* iterator */ - - total_num_lines = sci_get_line_count(doc->editor->sci); - - sci_start_undo_action(doc->editor->sci); +gint +rmemtyln(ScintillaObject *sci, gint line_num, gint end_line_num) +{ + gint changed = 0; /* number of lines removed */ - for(i = 0; i < total_num_lines; i++) /* loop through opened doc */ + while(line_num <= end_line_num) /* loop through lines */ { - if(sci_get_position_from_line(doc->editor->sci, i) == - sci_get_line_end_position(doc->editor->sci, i)) + /* check if the first posn of the line is also the end of line posn */ + if(sci_get_position_from_line(sci, line_num) == + sci_get_line_end_position (sci, line_num)) { - 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)); - total_num_lines--; - i--; + scintilla_send_message(sci, + SCI_DELETERANGE, + sci_get_position_from_line(sci, line_num), + sci_get_line_length(sci, line_num)); + + line_num--; + end_line_num--; + changed++; } + line_num++; } - sci_end_undo_action(doc->editor->sci); + /* return the number of lines deleted */ + return -changed; } /* 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); +gint +rmwhspln(ScintillaObject *sci, gint line_num, gint end_line_num) +{ + gint indent; /* indent position */ + gint changed = 0; /* number of lines removed */ - for(i = 0; i < total_num_lines; i++) /* loop through opened doc */ + while(line_num <= end_line_num) /* loop through lines */ { - indent = scintilla_send_message(doc->editor->sci, + indent = scintilla_send_message(sci, SCI_GETLINEINDENTPOSITION, - i, 0); + line_num, 0); + /* check if the posn of indentation is also the end of line posn */ 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(sci, line_num) == + sci_get_line_end_position (sci, line_num) - + sci_get_position_from_line(sci, line_num)) { - 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)); - total_num_lines--; - i--; + scintilla_send_message(sci, + SCI_DELETERANGE, + sci_get_position_from_line(sci, line_num), + sci_get_line_length(sci, line_num)); + + line_num--; + end_line_num--; + changed++; } + line_num++; } - - sci_end_undo_action(doc->editor->sci); + /* return the number of lines deleted */ + return -changed; } -/* Sort Lines Ascending and Descending */ -void sortlines(GeanyDocument *doc, gboolean asc) { - gint total_num_lines; /* number of lines in the document */ - gchar **lines; /* array to hold all lines in the document */ - gchar *new_file; /* *final* string to replace current document */ - gint i; /* iterator */ +/* Sort Lines Ascending */ +gint +sortlnsasc(gchar **lines, gint num_lines, gchar *new_file) +{ + gchar *nf_end = new_file; /* points to last char of new_file */ + gint i; + + qsort(lines, num_lines, sizeof(gchar *), compare_asc); + + /* join **lines into one string (new_file) */ + for(i = 0; i < num_lines; i++) + nf_end = g_stpcpy(nf_end, lines[i]); - total_num_lines = sci_get_line_count(doc->editor->sci); - lines = g_malloc(sizeof(gchar *) * (total_num_lines+1)); + return num_lines; +} - /* 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); +/* Sort Lines Descending */ +gint +sortlndesc(gchar **lines, gint num_lines, gchar *new_file) +{ + gchar *nf_end = new_file; /* points to last char of new_file */ + gint i; - /* sort **lines array */ - if(asc) - qsort(lines, total_num_lines, sizeof(gchar *), compare_asc); - else - qsort(lines, total_num_lines, sizeof(gchar *), compare_desc); + qsort(lines, num_lines, sizeof(gchar *), compare_desc); /* join **lines into one string (new_file) */ - lines[total_num_lines] = NULL; - new_file = g_strjoinv("", lines); - - /* set new document */ - sci_set_text(doc->editor->sci, new_file); + for(i = 0; i < num_lines; i++) + nf_end = g_stpcpy(nf_end, lines[i]); - /* free used memory */ - for(i = 0; i < total_num_lines; i++) - g_free(lines[i]); - g_free(lines); - g_free(new_file); + return num_lines; } Modified: lineoperations/src/linefunctions.h 28 lines changed, 20 insertions(+), 8 deletions(-) =================================================================== @@ -1,5 +1,6 @@ /* - * linefunctions.h - Line operations, remove duplicate lines, empty lines, lines with only whitespace, sort lines. + * linefunctions.h - Line operations, remove duplicate lines, empty lines, + * lines with only whitespace, sort lines. * * Copyright 2015 Sylvan Mostert <smostert.dev(a)gmail.com> * @@ -30,26 +31,37 @@ /* Remove Duplicate Lines, sorted */ -void rmdupst(GeanyDocument *doc); +gint +rmdupst(gchar **lines, gint num_lines, gchar *new_file); /* Remove Duplicate Lines, ordered */ -void rmdupln(GeanyDocument *doc); +gint +rmdupln(gchar **lines, gint num_lines, gchar *new_file); /* Remove Unique Lines */ -void rmunqln(GeanyDocument *doc); +gint +rmunqln(gchar **lines, gint num_lines, gchar *new_file); /* Remove Empty Lines */ -void rmemtyln(GeanyDocument *doc); +gint +rmemtyln(ScintillaObject *sci, gint line_num, gint end_line_num); /* Remove Whitespace Lines */ -void rmwhspln(GeanyDocument *doc); +gint +rmwhspln(ScintillaObject *sci, gint line_num, gint end_line_num); -/* Sort Lines Ascending and Descending */ -void sortlines(GeanyDocument *doc, gboolean asc); +/* Sort Lines Ascending */ +gint +sortlnsasc(gchar **lines, gint num_lines, gchar *new_file); + + +/* Sort Lines Descending */ +gint +sortlndesc(gchar **lines, gint num_lines, gchar *new_file); #endif Modified: lineoperations/src/lineoperations.c 237 lines changed, 214 insertions(+), 23 deletions(-) =================================================================== @@ -1,5 +1,6 @@ /* - * lineoperations.c - Line operations, remove duplicate lines, empty lines, lines with only whitespace, sort lines. + * lineoperations.c - Line operations, remove duplicate lines, empty lines, + * lines with only whitespace, sort lines. * * Copyright 2015 Sylvan Mostert <smostert.dev(a)gmail.com> * @@ -29,26 +30,212 @@ static GtkWidget *main_menu_item = NULL; -/* call custom func */ + +/* represents a selection of lines that will have Operation applied to */ +struct lo_lines { + gboolean is_selection; + gint start_line; + gint end_line; +}; + + +/* selects lines in document (based off of lo_lines struct parameter) */ static void -action_func_item(GtkMenuItem *menuitem, gpointer gdata) +select_lines(GeanyEditor *editor, struct lo_lines sel) { - void (*func)(GeanyDocument *) = gdata; - GeanyDocument *doc = NULL; - doc = document_get_current(); + /* set the selection to beginning of first line */ + sci_set_selection_start(editor->sci, + sci_get_position_from_line(editor->sci, sel.start_line)); - if(doc) func(doc); + /* set the selection to end of last line */ + sci_set_selection_end(editor->sci, + sci_get_line_end_position(editor->sci, sel.end_line) + + editor_get_eol_char_len(editor)); } -/* Sort Lines */ +/* get lo_lines struct based off of document */ +static struct lo_lines +get_current_sel_lines(ScintillaObject *sci) +{ + struct lo_lines sel = { FALSE, 0, 0 }; + gint start_posn = 0; /* position of selection start */ + gint end_posn = 0; /* position of selection end */ + + /* check for selection */ + if(sci_has_selection(sci)) + { + /* get the start and end *positions* */ + start_posn = sci_get_selection_start(sci); + end_posn = sci_get_selection_end (sci); + + /* get the *line number* of those positions */ + sel.start_line = scintilla_send_message(sci, + SCI_LINEFROMPOSITION, + start_posn, 0); + + sel.end_line = scintilla_send_message(sci, + SCI_LINEFROMPOSITION, + end_posn, 0); + + sel.is_selection = TRUE; + } + else + { + /* if there is no selection, start at first line */ + sel.start_line = 0; + /* and end at last one */ + sel.end_line = (sci_get_line_count(sci) - 1); + + sel.is_selection = FALSE; + } + + return sel; +} + + +/* altered from geany/src/editor.c, ensure new line at file end */ static void -action_sort_item(GtkMenuItem *menuitem, gpointer gdata) +ensure_final_newline(GeanyEditor *editor, gint *num_lines, struct lo_lines *sel) { - GeanyDocument *doc = NULL; - doc = document_get_current(); + gint end_document = sci_get_position_from_line(editor->sci, (*num_lines)); + gboolean append_newline = end_document > + sci_get_position_from_line(editor->sci, ((*num_lines) - 1)); + + if (append_newline) + { + const gchar *eol = editor_get_eol_char(editor); + sci_insert_text(editor->sci, end_document, eol); + + /* re-adjust the selection */ + (*num_lines)++; + (*sel).end_line++; + } +} + + +/* set statusbar with message and select altered lines */ +static void +user_indicate(GeanyEditor *editor, gint lines_affected, struct lo_lines sel) +{ + if(lines_affected < 0) + { + ui_set_statusbar(FALSE, _("Operation successful! %d lines removed."), + -lines_affected); + + /* select lines to indicate to user what lines were altered */ + sel.end_line += lines_affected; + + if(sel.is_selection) + select_lines(editor, sel); + } + else if(lines_affected == 0) + { + ui_set_statusbar(FALSE, _("Operation successful! No lines removed.")); + + /* select lines to indicate to user what lines were altered */ + if(sel.is_selection) + select_lines(editor, sel); + } + else + { + ui_set_statusbar(FALSE, _("Operation successful! %d lines affected."), + lines_affected); + + /* select lines to indicate to user what lines were altered */ + if(sel.is_selection) + select_lines(editor, sel); + } +} + + +/* + * Menu action for functions with indirect scintilla manipulation + * e.g. functions requiring **lines array, num_lines, *new_file +*/ +static void +action_indir_manip_item(GtkMenuItem *menuitem, gpointer gdata) +{ + /* function pointer to function to be used */ + gint (*func)(gchar **lines, gint num_lines, gchar *new_file) = gdata; + GeanyDocument *doc = document_get_current(); + + struct lo_lines sel = get_current_sel_lines(doc->editor->sci); + gint num_lines = (sel.end_line - sel.start_line) + 1; + + gint num_chars = 0; + gint i = 0; + gint lines_affected = 0; + + + /* if last line within selection ensure that the file ends with newline */ + if((sel.end_line + 1) == sci_get_line_count(doc->editor->sci)) + ensure_final_newline(doc->editor, &num_lines, &sel); + + /* get num_chars and **lines */ + gchar **lines = g_malloc(sizeof(gchar *) * num_lines); + for(i = 0; i < num_lines; i++) + { + num_chars += (sci_get_line_length(doc->editor->sci, + (i + sel.start_line))); + + lines[i] = sci_get_line(doc->editor->sci, + (i + sel.start_line)); + } + + gchar *new_file = g_malloc(sizeof(gchar) * (num_chars + 1)); + new_file[0] = '\0'; + + /* select lines that will be replaced with array */ + select_lines(doc->editor, sel); + + sci_start_undo_action(doc->editor->sci); + + + if(doc) + lines_affected = func(lines, num_lines, new_file); + + + /* set new document */ + sci_replace_sel(doc->editor->sci, new_file); + + /* select affected lines and set statusbar message */ + user_indicate(doc->editor, lines_affected, sel); + + sci_end_undo_action(doc->editor->sci); + + /* free used memory */ + for(i = 0; i < num_lines; i++) + g_free(lines[i]); + g_free(lines); + g_free(new_file); +} + + + +/* + * Menu action for functions with direct scintilla manipulation + * e.g. no need for **lines array, *new_file... +*/ +static void +action_sci_manip_item(GtkMenuItem *menuitem, gpointer gdata) +{ + /* function pointer to gdata -- function to be used */ + gint (*func)(ScintillaObject *, gint, gint) = gdata; + GeanyDocument *doc = document_get_current(); + struct lo_lines sel = get_current_sel_lines(doc->editor->sci); + gint lines_affected = 0; + + + sci_start_undo_action(doc->editor->sci); + + if(doc) + lines_affected = func(doc->editor->sci, sel.start_line, sel.end_line); + + /* put message in ui_statusbar, and highlight lines that were affected */ + user_indicate(doc->editor, lines_affected, sel); - if(doc) sortlines(doc, GPOINTER_TO_INT(gdata)); + sci_end_undo_action(doc->editor->sci); } @@ -65,21 +252,21 @@ lo_init(GeanyPlugin *plugin, gpointer gdata) gpointer cb_data; } menu_items[] = { { N_("Remove Duplicate Lines, _Sorted"), - G_CALLBACK(action_func_item), (gpointer) rmdupst }, + G_CALLBACK(action_indir_manip_item), (gpointer) rmdupst }, { N_("Remove Duplicate Lines, _Ordered"), - G_CALLBACK(action_func_item), (gpointer) rmdupln }, + G_CALLBACK(action_indir_manip_item), (gpointer) rmdupln }, { N_("Remove _Unique Lines"), - G_CALLBACK(action_func_item), (gpointer) rmunqln }, + G_CALLBACK(action_indir_manip_item), (gpointer) rmunqln }, { NULL }, { N_("Remove _Empty Lines"), - G_CALLBACK(action_func_item), (gpointer) rmemtyln }, + G_CALLBACK(action_sci_manip_item), (gpointer) rmemtyln }, { N_("Remove _Whitespace Lines"), - G_CALLBACK(action_func_item), (gpointer) rmwhspln }, + G_CALLBACK(action_sci_manip_item), (gpointer) rmwhspln }, { NULL }, { N_("Sort Lines _Ascending"), - G_CALLBACK(action_sort_item), GINT_TO_POINTER(1) }, + G_CALLBACK(action_indir_manip_item), (gpointer) sortlnsasc }, { N_("Sort Lines _Descending"), - G_CALLBACK(action_sort_item), GINT_TO_POINTER(0) } + G_CALLBACK(action_indir_manip_item), (gpointer) sortlndesc } }; main_menu_item = gtk_menu_item_new_with_mnemonic(_("_Line Operations")); @@ -97,7 +284,10 @@ 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, menu_items[i].cb_data); + g_signal_connect(item, + "activate", + menu_items[i].cb_activate, + menu_items[i].cb_data); ui_add_document_sensitive(item); } @@ -106,7 +296,8 @@ lo_init(GeanyPlugin *plugin, gpointer gdata) } 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); + gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), + main_menu_item); return TRUE; } @@ -125,8 +316,8 @@ 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->description = _("Line Operations provides a handful of functions that can be applied to a document or selection such as, removing duplicate lines, removing empty lines, removing lines with only whitespace, and sorting lines."); + plugin->info->version = "0.2"; plugin->info->author = "Sylvan Mostert <smostert.dev(a)gmail.com>"; plugin->funcs->init = lo_init; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 52d749: Midterm update of NEWS file
by Frank Lanitz 03 Jan '17

03 Jan '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Tue, 03 Jan 2017 21:00:45 UTC Commit: 52d7498bb3c3a51b364ac025289e14a89704156a https://github.com/geany/geany-plugins/commit/52d7498bb3c3a51b364ac025289e1… Log Message: ----------- Midterm update of NEWS file Modified Paths: -------------- NEWS Modified: NEWS 41 lines changed, 40 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,45 @@ Geany Plugins 1.30 (not yet released) - No changes so far. + General: + * + + Automark: + * Fix a possible crash if nothing is selected for automarking + * Replace internal usage of deprecated functions + + Commander: + * Fix a possible crash on startup with latest GTK3 + + Debugger: + * Fix a possible crash if debug-modus is enabled (PR##511) + + GeanyDoc: + * Improve compatibility with Gtk3 + + GeanyLua + * Remove deprecated GeanyFunctions from interface provided by this + plugin (PR##439) + * Fix build with latest Scintilla (PR##510) + + Markdown: + * Allow exporting Markdown as HTML (PR##502) + * Fix relative paths (PR##501) + + PairTagHighlighter: + * Add keybinding for jumping to matching tag (PR##466) + * Improve compatibility with Gtk3 (PR##466) + + Spellcheck: + * Treat underscore as word seperator (PR##512) + + Tableconvert: + * Fix markup of documentation + + Treebrowser: + * Fix a possible memory leak (PR##478) + + Internationalization: + * Updated translations: Geany Plugins 1.29 (2016-11-13) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 3b07d3: upstream compatibility
by Sagar Chalise 03 Jan '17

03 Jan '17

Branch: refs/heads/master Author: Sagar Chalise <chalisesagar(a)gmail.com> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Tue, 03 Jan 2017 20:44:23 UTC Commit: 3b07d3068133df76a2586f323342df70fb9216fb https://github.com/geany/geany-plugins/commit/3b07d3068133df76a2586f323342d… Log Message: ----------- upstream compatibility Modified Paths: -------------- geanymacro/src/geanymacro.c Modified: geanymacro/src/geanymacro.c 20 lines changed, 10 insertions(+), 10 deletions(-) =================================================================== @@ -174,12 +174,12 @@ enum GEANY_MACRO_BUTTON { GeanyPlugin *geany_plugin; GeanyData *geany_data; -GeanyFunctions *geany_functions; -PLUGIN_VERSION_CHECK(147) +PLUGIN_VERSION_CHECK(224) -PLUGIN_SET_INFO(_("Macros"),_("Macros for Geany"), - "1.1","William Fraser <william.fraser(a)virgin.net>") +PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, + _("Macros"),_("Macros for Geany"), + "1.1","William Fraser <william.fraser(a)virgin.net>") /* Plugin user alterable settings */ static gboolean bSaveMacros=TRUE; @@ -1399,10 +1399,10 @@ static void EditSearchOptions(GtkTreeModel *model,GtkTreeIter *iter) gtk_widget_show(vbox); /* create combobox to hold search direction */ - gtkcb=gtk_combo_box_new_text(); - gtk_combo_box_append_text((GtkComboBox*)gtkcb,_("Search Forwards")); - gtk_combo_box_append_text((GtkComboBox*)gtkcb,_("Search Backwards")); - gtk_combo_box_set_active((GtkComboBox*)gtkcb,(mde->message==SCI_SEARCHNEXT)?0:1); + gtkcb=gtk_combo_box_text_new(); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gtkcb),_("Search Forwards")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gtkcb),_("Search Backwards")); + gtk_combo_box_set_active(GTK_COMBO_BOX(gtkcb),(mde->message==SCI_SEARCHNEXT)?0:1); gtk_box_pack_start(GTK_BOX(vbox),gtkcb,FALSE,FALSE,2); gtk_widget_show(gtkcb); @@ -1808,8 +1808,8 @@ static void EditMacroElements(Macro *m) GTK_SELECTION_SINGLE); /* add table to dialog */ - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox),table); -/* gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),table,FALSE,FALSE,2);*/ + gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),table); +/* gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),table,FALSE,FALSE,2);*/ gtk_widget_show(table); /* add buttons */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] c8aa0b: Macro gtk3 compatibility [Needs testing]
by Sagar Chalise 03 Jan '17

03 Jan '17

Branch: refs/heads/master Author: Sagar Chalise <chalisesagar(a)gmail.com> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Tue, 03 Jan 2017 20:44:23 UTC Commit: c8aa0b97d713fc2a4848570754235e4fbd306d78 https://github.com/geany/geany-plugins/commit/c8aa0b97d713fc2a4848570754235… Log Message: ----------- Macro gtk3 compatibility [Needs testing] Modified Paths: -------------- geanymacro/src/geanymacro.c Modified: geanymacro/src/geanymacro.c 20 lines changed, 10 insertions(+), 10 deletions(-) =================================================================== @@ -174,12 +174,12 @@ enum GEANY_MACRO_BUTTON { GeanyPlugin *geany_plugin; GeanyData *geany_data; +GeanyFunctions *geany_functions; -PLUGIN_VERSION_CHECK(224) +PLUGIN_VERSION_CHECK(147) -PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, - _("Macros"),_("Macros for Geany"), - "1.1","William Fraser <william.fraser(a)virgin.net>") +PLUGIN_SET_INFO(_("Macros"),_("Macros for Geany"), + "1.1","William Fraser <william.fraser(a)virgin.net>") /* Plugin user alterable settings */ static gboolean bSaveMacros=TRUE; @@ -1399,10 +1399,10 @@ static void EditSearchOptions(GtkTreeModel *model,GtkTreeIter *iter) gtk_widget_show(vbox); /* create combobox to hold search direction */ - gtkcb=gtk_combo_box_text_new(); - gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gtkcb),_("Search Forwards")); - gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gtkcb),_("Search Backwards")); - gtk_combo_box_set_active(GTK_COMBO_BOX(gtkcb),(mde->message==SCI_SEARCHNEXT)?0:1); + gtkcb=gtk_combo_box_new_text(); + gtk_combo_box_append_text((GtkComboBox*)gtkcb,_("Search Forwards")); + gtk_combo_box_append_text((GtkComboBox*)gtkcb,_("Search Backwards")); + gtk_combo_box_set_active((GtkComboBox*)gtkcb,(mde->message==SCI_SEARCHNEXT)?0:1); gtk_box_pack_start(GTK_BOX(vbox),gtkcb,FALSE,FALSE,2); gtk_widget_show(gtkcb); @@ -1808,8 +1808,8 @@ static void EditMacroElements(Macro *m) GTK_SELECTION_SINGLE); /* add table to dialog */ - gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),table); -/* gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),table,FALSE,FALSE,2);*/ + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox),table); +/* gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),table,FALSE,FALSE,2);*/ gtk_widget_show(table); /* add buttons */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 06a579: Added keybinding for jumping to matching tag
by Sagar Chalise 03 Jan '17

03 Jan '17

Branch: refs/heads/master Author: Sagar Chalise <chalisesagar(a)gmail.com> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Tue, 03 Jan 2017 20:44:23 UTC Commit: 06a5792475c836e013a58917b315f452ae575f0f https://github.com/geany/geany-plugins/commit/06a5792475c836e013a58917b315f… Log Message: ----------- Added keybinding for jumping to matching tag Modified Paths: -------------- pairtaghighlighter/src/pair_tag_highlighter.c Modified: pairtaghighlighter/src/pair_tag_highlighter.c 31 lines changed, 30 insertions(+), 1 deletions(-) =================================================================== @@ -21,6 +21,12 @@ #define NONMATCHING_PAIR_COLOR 0xff0000 /* red */ #define EMPTY_TAG_COLOR 0xffff00 /* yellow */ +/* Keyboard Shortcut */ +enum { + KB_MATCH_TAG, + KB_COUNT +}; + /* These items are set by Geany before plugin_init() is called. */ GeanyPlugin *geany_plugin; GeanyData *geany_data; @@ -382,7 +388,7 @@ static gboolean on_editor_notify(GObject *obj, GeanyEditor *editor, gint lexer; lexer = sci_get_lexer(editor->sci); - if((lexer != SCLEX_HTML) && (lexer != SCLEX_XML)) + if((lexer != SCLEX_HTML) && (lexer != SCLEX_XML) && (lexer != SCLEX_PHPSCRIPT)) { return FALSE; } @@ -399,6 +405,25 @@ static gboolean on_editor_notify(GObject *obj, GeanyEditor *editor, return FALSE; } +static void +on_kb_goto_matching_tag (guint key_id) +{ + gint cur_line; + gint jump_line = 0; + if(highlightedBrackets[0] != highlightedBrackets[2] && highlightedBrackets[0] != 0){ + GeanyDocument *doc = document_get_current(); + cur_line = sci_get_current_position(doc->editor->sci); + if(cur_line >= highlightedBrackets[0] && cur_line <= highlightedBrackets[1]){ + jump_line = highlightedBrackets[2]; + } + else if(cur_line >= highlightedBrackets[2] && cur_line <= highlightedBrackets[3]){ + jump_line = highlightedBrackets[0]; + } + if(jump_line != 0){ + sci_set_current_position(doc->editor->sci, jump_line, TRUE); + } + } +} PluginCallback plugin_callbacks[] = { @@ -409,6 +434,10 @@ PluginCallback plugin_callbacks[] = void plugin_init(GeanyData *data) { + GeanyKeyGroup *group; + group = plugin_set_key_group (geany_plugin, "Pair Tag Highlighter", KB_COUNT, NULL); + keybindings_set_item (group, KB_MATCH_TAG, on_kb_goto_matching_tag, + 0, 0, "goto_matching_tag", _("Go To Matching Tag"), NULL); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] adef49: Merge pull request #512 from eht16/spellcheck_underscore_word_sep_issue496
by Frank Lanitz 03 Jan '17

03 Jan '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Tue, 03 Jan 2017 20:14:11 UTC Commit: adef494292950ab0953a8b62f7689425df8747f8 https://github.com/geany/geany-plugins/commit/adef494292950ab0953a8b62f7689… Log Message: ----------- Merge pull request #512 from eht16/spellcheck_underscore_word_sep_issue496 Treat underscore as word seperator Modified Paths: -------------- spellcheck/src/speller.c Modified: spellcheck/src/speller.c 29 lines changed, 24 insertions(+), 5 deletions(-) =================================================================== @@ -205,6 +205,8 @@ gint sc_speller_process_line(GeanyDocument *doc, gint line_number) gint suggestions_found = 0; gint wordchars_len; gchar *wordchars; + gchar *underscore_in_wordchars = NULL; + gboolean wordchars_modified = FALSE; g_return_val_if_fail(sc_speller_dict != NULL, 0); g_return_val_if_fail(doc != NULL, 0); @@ -218,9 +220,21 @@ gint sc_speller_process_line(GeanyDocument *doc, gint line_number) { /* temporarily add "'" to the wordchars */ wordchars[wordchars_len] = '\''; + wordchars_modified = TRUE; + } + underscore_in_wordchars = strchr(wordchars, '_'); + if (underscore_in_wordchars != NULL) + { + /* Temporarily remove underscore from the wordchars to treat + * it as a word seperator. Replace it by a "'" which we added already above. */ + *underscore_in_wordchars = '\''; + wordchars_modified = TRUE; + } + if (wordchars_modified) + { + /* apply previously changed WORDCHARS setting */ scintilla_send_message(doc->editor->sci, SCI_SETWORDCHARS, 0, (sptr_t)wordchars); } - pos_start = sci_get_position_from_line(doc->editor->sci, line_number); pos_end = sci_get_position_from_line(doc->editor->sci, line_number + 1); @@ -242,10 +256,15 @@ gint sc_speller_process_line(GeanyDocument *doc, gint line_number) g_free(word); } - /* reset wordchars for the current document */ - wordchars[wordchars_len] = '\0'; - scintilla_send_message(doc->editor->sci, SCI_SETWORDCHARS, 0, (sptr_t)wordchars); - + if (wordchars_modified) + { + if (underscore_in_wordchars != NULL) + /* re-add underscore if we removed it above */ + *underscore_in_wordchars = '_'; + /* reset wordchars for the current document */ + wordchars[wordchars_len] = '\0'; + scintilla_send_message(doc->editor->sci, SCI_SETWORDCHARS, 0, (sptr_t)wordchars); + } g_free(wordchars); return suggestions_found; } -------------- 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 2017