Plugins-Commits August 2017

plugins-commits@lists.geany.org

1 participants
16 discussions

[geany/geany-plugins] c02fc1: git-changebar: Move cursor at the end of the undone hunk text for deleted hunk
by Jiří Techet 19 Aug '17

19 Aug '17

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 22 May 2017 13:06:15 UTC Commit: c02fc17affdecaa3743a6dc012e21f061b4e4020 https://github.com/geany/geany-plugins/commit/c02fc17affdecaa3743a6dc012e21… Log Message: ----------- git-changebar: Move cursor at the end of the undone hunk text for deleted hunk For deleted hunk, move cursor at the end of the undone text. This behavior corresponds to what normal undo does - when undoing deletion, cursor is also placed at the end of the newly inserted text. Also change primary position for SCI_SCROLLRANGE in this case so it becomes the cursor position. Modified Paths: -------------- git-changebar/src/gcb-plugin.c Modified: git-changebar/src/gcb-plugin.c 12 lines changed, 7 insertions(+), 5 deletions(-) =================================================================== @@ -1190,28 +1190,30 @@ undo_hunk_cb (const gchar *path, if (data->found) { ScintillaObject *sci = doc->editor->sci; gint line = data->new_start - (data->new_lines ? 1 : 0); + gint pos = sci_get_position_from_line (sci, line); sci_start_undo_action (sci); if (data->new_lines > 0) { - gint pos = sci_get_position_from_line (sci, line); sci_set_target_start (sci, pos); pos = sci_get_position_from_line (sci, line + data->new_lines); sci_set_target_end (sci, pos); sci_replace_target (sci, "", FALSE); } if (data->old_lines > 0) { - gint pos = sci_get_position_from_line (sci, line); - + pos = sci_get_position_from_line (sci, line); insert_buf_range (doc, contents, pos, data->old_start - 1, data->old_lines); + + pos = sci_get_position_from_line (sci, line + data->old_lines); + sci_set_current_position (sci, pos, FALSE); } scintilla_send_message (sci, SCI_SCROLLRANGE, - sci_get_position_from_line (sci, line + data->old_lines), - sci_get_position_from_line (sci, line)); + sci_get_position_from_line (sci, line), + pos); sci_end_undo_action (sci); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] c428a8: git-changebar: Define REMOVED_MARKER_POS() macro and use it to cleanup code
by Jiří Techet 19 Aug '17

19 Aug '17

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 22 May 2017 13:06:15 UTC Commit: c428a8f4eba44c08deef56ae997d8cce4a48d118 https://github.com/geany/geany-plugins/commit/c428a8f4eba44c08deef56ae997d8… Log Message: ----------- git-changebar: Define REMOVED_MARKER_POS() macro and use it to cleanup code Modified Paths: -------------- git-changebar/src/gcb-plugin.c Modified: git-changebar/src/gcb-plugin.c 8 lines changed, 5 insertions(+), 3 deletions(-) =================================================================== @@ -73,6 +73,8 @@ PLUGIN_SET_TRANSLATABLE_INFO ( #define DOC_ID_QTAG \ (g_quark_from_string (PLUGIN"/git-doc-id")) +#define REMOVED_MARKER_POS(pos) \ + ((pos) == 0 ? 0 : (pos) - 1) enum { MARKER_LINE_ADDED, @@ -745,7 +747,7 @@ diff_hunk_cb (const git_diff_delta *delta, scintilla_send_message (sci, SCI_MARKERADD, line - 1, G_markers[marker].num); } } else { - line = (hunk->new_start == 0) ? 0 : hunk->new_start - 1; + line = REMOVED_MARKER_POS (hunk->new_start); scintilla_send_message (sci, SCI_MARKERADD, line, G_markers[MARKER_LINE_REMOVED].num); } @@ -1061,13 +1063,13 @@ goto_next_hunk_diff_hunk_cb (const git_diff_delta *delta, if (data->next_line >= 0) { return 1; } else if (data->line < hunk->new_start - 1) { - data->next_line = (hunk->new_start == 0) ? 0 : hunk->new_start - 1; + data->next_line = REMOVED_MARKER_POS (hunk->new_start); } break; case KB_GOTO_PREV_HUNK: if (data->line > hunk->new_start - 1 + MAX (hunk->new_lines - 1, 0)) { - data->next_line = (hunk->new_start == 0) ? 0 : hunk->new_start - 1; + data->next_line = REMOVED_MARKER_POS (hunk->new_start); } break; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 4242fb: git-changebar: Update documentation with the "undo hunk" feature
by Jiří Techet 19 Aug '17

19 Aug '17

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 22 May 2017 13:06:15 UTC Commit: 4242fb95d60f8bf35bbe16780927aa8e72987614 https://github.com/geany/geany-plugins/commit/4242fb95d60f8bf35bbe16780927a… Log Message: ----------- git-changebar: Update documentation with the "undo hunk" feature Modified Paths: -------------- git-changebar/README Modified: git-changebar/README 8 lines changed, 6 insertions(+), 2 deletions(-) =================================================================== @@ -8,8 +8,8 @@ Git Change Bar About ===== -This plugin highlights uncommitted changes to files tracked with Git, and -allows to navigate through the hunks. +This plugin highlights uncommitted changes to files tracked with Git, +allows to navigate through the hunks and undo them. Requirements @@ -38,6 +38,10 @@ To navigate through the hunks of the current file, you need to configure the plugin's *Go to next hunk* and *Go to previous hunk* keybindings in Geany's preferences dialog. +Hunks can also be undone by either setting a cursor at a line with a hunk and +invoking the *Undo hunk at the cursor position* or by right-clicking in the +editor where the hunk is located and selecting *Undo Git hunk* from the popup +menu. License ======= -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 0c77ad: git-changebar: Don't rely on the caret position too much
by Colomban Wendling 19 Aug '17

19 Aug '17

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 22 May 2017 13:06:14 UTC Commit: 0c77ad778c84209ecf0237bd5f76162a619ef235 https://github.com/geany/geany-plugins/commit/0c77ad778c84209ecf0237bd5f761… Log Message: ----------- git-changebar: Don't rely on the caret position too much Don't rely on the caret position when altering the document to undo a hunk, and use the hunk position itself instead. This allows to use the same mechanism anywhere in the document regardless of the caret position, making the code more easily reusable. Modified Paths: -------------- git-changebar/src/gcb-plugin.c Modified: git-changebar/src/gcb-plugin.c 26 lines changed, 10 insertions(+), 16 deletions(-) =================================================================== @@ -123,7 +123,6 @@ struct UndoHunkData { guint doc_id; gint line; gboolean found; - gboolean first_line_removed; gint old_start; gint old_lines; gint new_start; @@ -1151,17 +1150,15 @@ undo_hunk_diff_hunk_cb (const git_diff_delta *delta, void *udata) { UndoHunkData *data = udata; - gboolean first_line_removed = is_first_line_removed (data->line, hunk->new_start, hunk->new_lines); - - if (first_line_removed || + + if (is_first_line_removed (data->line, hunk->new_start, hunk->new_lines) || (data->line >= hunk->new_start && data->line < hunk->new_start + MAX (1, hunk->new_lines))) { data->old_start = hunk->old_start; data->old_lines = hunk->old_lines; data->new_start = hunk->new_start; data->new_lines = hunk->new_lines; data->found = TRUE; - data->first_line_removed = first_line_removed; return 1; } @@ -1180,33 +1177,30 @@ undo_hunk_cb (const gchar *path, diff_buf_to_doc (contents, doc, undo_hunk_diff_hunk_cb, data); if (data->found) { - ScintillaObject *sci = doc->editor->sci; + ScintillaObject *sci = doc->editor->sci; + gint line = data->new_start - (data->new_lines ? 1 : 0); sci_start_undo_action (sci); if (data->new_lines > 0) { - gint pos = sci_get_position_from_line (sci, data->new_start - 1); + gint pos = sci_get_position_from_line (sci, line); sci_set_target_start (sci, pos); - pos = sci_get_position_from_line (sci, data->new_start + data->new_lines - 1); + pos = sci_get_position_from_line (sci, line + data->new_lines); sci_set_target_end (sci, pos); sci_replace_target (sci, "", FALSE); } if (data->old_lines > 0) { - gint line = sci_get_current_line (sci); - gint pos; - - if (data->new_lines == 0 && !data->first_line_removed) { - line++; /* marker for deleted hunk is on previous line except the 1st line */ - } - pos = sci_get_position_from_line (sci, line); + gint pos = sci_get_position_from_line (sci, line); insert_buf_range (doc, contents, pos, data->old_start - 1, data->old_lines); } - sci_scroll_caret (sci); + scintilla_send_message (sci, SCI_SCROLLRANGE, + sci_get_position_from_line (sci, line + data->old_lines), + sci_get_position_from_line (sci, line)); sci_end_undo_action (sci); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 939fe5: git-changebar: Fix a typo
by Colomban Wendling 19 Aug '17

19 Aug '17

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 22 May 2017 13:06:14 UTC Commit: 939fe5da08d33573c499fbe62de4101bd96e6e71 https://github.com/geany/geany-plugins/commit/939fe5da08d33573c499fbe62de41… Log Message: ----------- git-changebar: Fix a typo Modified Paths: -------------- git-changebar/src/gcb-plugin.c Modified: git-changebar/src/gcb-plugin.c 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -602,7 +602,7 @@ release_resources (ScintillaObject *sci) /* checks whether @encoding needs to be converted to UTF-8 */ static gboolean -encoding_needs_coversion (const gchar *encoding) +encoding_needs_conversion (const gchar *encoding) { return (encoding && ! utils_str_equal (encoding, "UTF-8") && @@ -705,7 +705,7 @@ diff_buf_to_doc (const git_buf *old_buf, free_buf = add_utf8_bom (&buf, &len, free_buf); } /* convert the buffer back to in-file encoding if necessary */ - if (encoding_needs_coversion (doc->encoding)) { + if (encoding_needs_conversion (doc->encoding)) { free_buf = convert_encoding_inplace (&buf, &len, free_buf, doc->encoding, "UTF-8", NULL); } @@ -785,7 +785,7 @@ get_widget_for_buf_range (GeanyDocument *doc, } /* convert the buffer to UTF-8 if necessary */ - if (encoding_needs_coversion (doc->encoding)) { + if (encoding_needs_conversion (doc->encoding)) { free_buf = convert_encoding_inplace (&buf, &buf_len, free_buf, "UTF-8", doc->encoding, NULL); } @@ -1121,7 +1121,7 @@ insert_buf_range (GeanyDocument *doc, gchar *old_range; /* convert the buffer to UTF-8 if necessary */ - if (encoding_needs_coversion (doc->encoding)) { + if (encoding_needs_conversion (doc->encoding)) { free_buf = convert_encoding_inplace (&old_buf, &old_buf_len, free_buf, "UTF-8", doc->encoding, NULL); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] cc6889: git-changebar: Add an editor menu item for undoing hunks
by Colomban Wendling 19 Aug '17

19 Aug '17

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 22 May 2017 13:06:15 UTC Commit: cc6889cafb52b59f47fe25c2e0cc65f234054ebd https://github.com/geany/geany-plugins/commit/cc6889cafb52b59f47fe25c2e0cc6… Log Message: ----------- git-changebar: Add an editor menu item for undoing hunks Modified Paths: -------------- git-changebar/src/gcb-plugin.c Modified: git-changebar/src/gcb-plugin.c 91 lines changed, 88 insertions(+), 3 deletions(-) =================================================================== @@ -68,6 +68,10 @@ PLUGIN_SET_TRANSLATABLE_INFO ( #define RESOURCES_ALLOCATED_QTAG \ (g_quark_from_string (PLUGIN"/git-resources-allocated")) +#define UNDO_LINE_QTAG \ + (g_quark_from_string (PLUGIN"/git-undo-line")) +#define DOC_ID_QTAG \ + (g_quark_from_string (PLUGIN"/git-doc-id")) enum { @@ -166,6 +170,7 @@ static GAsyncQueue *G_queue = NULL; static GThread *G_thread = NULL; static gulong G_source_id = 0; static gboolean G_monitoring_enabled = TRUE; +static GtkWidget *G_undo_menu_item = NULL; static struct { gint num; gint style; @@ -916,6 +921,8 @@ update_diff (const gchar *path, } } + gtk_widget_set_visible (G_undo_menu_item, contents != NULL); + if (contents && (allocated || allocate_resources (sci))) { diff_buf_to_doc (contents, doc, diff_hunk_cb, sci); } else if (! contents && allocated) { @@ -978,6 +985,8 @@ update_diff_push (GeanyDocument *doc, { g_return_if_fail (DOC_VALID (doc)); + gtk_widget_hide (G_undo_menu_item); + if (G_source_id) { g_source_remove (G_source_id); G_source_id = 0; @@ -1210,19 +1219,84 @@ undo_hunk_cb (const gchar *path, } static void +undo_hunk (GeanyDocument *doc, + gint line) +{ + UndoHunkData *data = g_slice_alloc (sizeof *data); + + data->doc_id = doc->id; + data->line = line + 1; + data->found = FALSE; + + get_cached_blob_contents_async (doc->real_path, doc->id, FALSE, + undo_hunk_cb, data); +} + +static void on_kb_undo_hunk (guint kb) { GeanyDocument *doc = document_get_current (); if (doc) { + undo_hunk (doc, sci_get_current_line (doc->editor->sci)); + } +} + +static void +on_undo_hunk_activate (GtkWidget *widget, + gpointer user_data) +{ + GeanyDocument *doc = document_get_current (); + gpointer doc_id = g_object_get_qdata (G_OBJECT (widget), DOC_ID_QTAG); + + if (doc && doc->id == GPOINTER_TO_UINT (doc_id) && + gtk_widget_get_sensitive (widget)) { + gpointer line = g_object_get_qdata (G_OBJECT (widget), UNDO_LINE_QTAG); + + undo_hunk (doc, GPOINTER_TO_INT (line)); + } +} + +static void +check_undo_hunk_cb (const gchar *path, + git_buf *contents, + gpointer udata) +{ + UndoHunkData *data = udata; + GeanyDocument *doc = document_get_current (); + + if (doc && doc->id == data->doc_id && contents) { + diff_buf_to_doc (contents, doc, undo_hunk_diff_hunk_cb, data); + if (data->found) { + gtk_widget_set_sensitive (G_undo_menu_item, TRUE); + g_object_set_qdata (G_OBJECT (G_undo_menu_item), UNDO_LINE_QTAG, + GINT_TO_POINTER (data->line - 1)); + g_object_set_qdata (G_OBJECT (G_undo_menu_item), DOC_ID_QTAG, + GUINT_TO_POINTER (data->doc_id)); + } + } + + g_slice_free1 (sizeof *data, data); +} + +static void +on_update_editor_menu (GObject *object, + const gchar *word, + gint pos, + GeanyDocument *doc, + gpointer user_data) +{ + gtk_widget_set_sensitive (G_undo_menu_item, FALSE); + + if (doc) { UndoHunkData *data = g_slice_alloc (sizeof *data); data->doc_id = doc->id; - data->line = sci_get_current_line (doc->editor->sci) + 1; + data->line = sci_get_line_from_position (doc->editor->sci, pos) + 1; data->found = FALSE; get_cached_blob_contents_async (doc->real_path, doc->id, FALSE, - undo_hunk_cb, data); + check_undo_hunk_cb, data); } } @@ -1407,16 +1481,25 @@ plugin_init (GeanyData *data) load_config (); + G_undo_menu_item = gtk_menu_item_new_with_label (_("Undo Git hunk")); + g_signal_connect (G_undo_menu_item, "activate", + G_CALLBACK (on_undo_hunk_activate), NULL); + gtk_container_add (GTK_CONTAINER (data->main_widgets->editor_menu), + G_undo_menu_item); + kb_group = plugin_set_key_group (geany_plugin, PLUGIN, KB_COUNT, NULL); keybindings_set_item (kb_group, KB_GOTO_PREV_HUNK, on_kb_goto_next_hunk, 0, 0, "goto-prev-hunk", _("Go to the previous hunk"), NULL); keybindings_set_item (kb_group, KB_GOTO_NEXT_HUNK, on_kb_goto_next_hunk, 0, 0, "goto-next-hunk", _("Go to the next hunk"), NULL); keybindings_set_item (kb_group, KB_UNDO_HUNK, on_kb_undo_hunk, 0, 0, - "undo-hunk", _("Undo hunk at the cursor position"), NULL); + "undo-hunk", _("Undo hunk at the cursor position"), + G_undo_menu_item); plugin_signal_connect (geany_plugin, NULL, "editor-notify", TRUE, G_CALLBACK (on_editor_notify), NULL); + plugin_signal_connect (geany_plugin, NULL, "update-editor-menu", TRUE, + G_CALLBACK (on_update_editor_menu), NULL); plugin_signal_connect (geany_plugin, NULL, "document-activate", TRUE, G_CALLBACK (on_document_activate), NULL); plugin_signal_connect (geany_plugin, NULL, "document-reload", TRUE, @@ -1438,6 +1521,8 @@ plugin_cleanup (void) { guint i; + gtk_widget_destroy (G_undo_menu_item); + if (G_source_id) { g_source_remove (G_source_id); G_source_id = 0; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] caca89: git-changebar: Add the possibility to undo hunk at cursor position
by Jiří Techet 19 Aug '17

19 Aug '17

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 22 May 2017 13:06:08 UTC Commit: caca891c519ff58766d5c5cc4b12bd3a3b4fa95d https://github.com/geany/geany-plugins/commit/caca891c519ff58766d5c5cc4b12b… Log Message: ----------- git-changebar: Add the possibility to undo hunk at cursor position The patch adds a new keybinding action for undoing hunks. When cursor is placed at a line with a diff and the keybinding is invoked, the corresponding hunk is undone. To get the previous contents at the given position, a temporary Scintilla instance is used into which the previous state of the document is loaded and the corresponding text from the previous state of the document is extracted. This temporary Scintilla object is then destroyed. Modified Paths: -------------- git-changebar/src/gcb-plugin.c Modified: git-changebar/src/gcb-plugin.c 136 lines changed, 136 insertions(+), 0 deletions(-) =================================================================== @@ -80,6 +80,7 @@ enum { enum { KB_GOTO_PREV_HUNK, KB_GOTO_NEXT_HUNK, + KB_UNDO_HUNK, KB_COUNT }; @@ -117,6 +118,16 @@ struct GotoNextHunkData { gint next_line; }; +typedef struct UndoHunkData UndoHunkData; +struct UndoHunkData { + guint doc_id; + gint line; + gboolean found; + gint old_start; + gint old_lines; + gint new_start; + gint new_lines; +}; static void on_git_repo_changed (GFileMonitor *monitor, GFile *file, @@ -1086,6 +1097,129 @@ on_kb_goto_next_hunk (guint kb) } } +static void +insert_buf_range (GeanyDocument *doc, + const git_buf *old_contents, + gint pos, + gint old_start, + gint old_lines) +{ + ScintillaObject *old_sci = editor_create_widget (doc->editor); + gchar *old_buf = old_contents->ptr; + gsize old_buf_len = old_contents->size; + gboolean free_buf = FALSE; + gint old_pos_start; + gint old_pos_end; + gchar *old_range; + + /* convert the buffer to UTF-8 if necessary */ + if (encoding_needs_coversion (doc->encoding)) { + free_buf = convert_encoding_inplace (&old_buf, &old_buf_len, free_buf, + "UTF-8", doc->encoding, NULL); + } + + scintilla_send_message (old_sci, SCI_ADDTEXT, old_buf_len, (glong) old_buf); + + old_pos_start = sci_get_position_from_line (old_sci, old_start); + old_pos_end = sci_get_position_from_line (old_sci, old_start + old_lines); + old_range = sci_get_contents_range (old_sci, old_pos_start, old_pos_end); + + sci_insert_text (doc->editor->sci, pos, old_range); + + g_free (old_range); + + if (free_buf) { + g_free (old_buf); + } + + g_object_ref_sink (old_sci); + g_object_unref (old_sci); +} + +static int +undo_hunk_diff_hunk_cb (const git_diff_delta *delta, + const git_diff_hunk *hunk, + void *udata) +{ + UndoHunkData *data = udata; + + if (data->line >= hunk->new_start && + data->line < hunk->new_start + MAX (1, hunk->new_lines)) { + data->old_start = hunk->old_start; + data->old_lines = hunk->old_lines; + data->new_start = hunk->new_start; + data->new_lines = hunk->new_lines; + data->found = TRUE; + return 1; + } + + return 0; +} + +static void +undo_hunk_cb (const gchar *path, + git_buf *contents, + gpointer udata) +{ + UndoHunkData *data = udata; + GeanyDocument *doc = document_get_current (); + + if (doc && doc->id == data->doc_id && contents) { + diff_buf_to_doc (contents, doc, undo_hunk_diff_hunk_cb, data); + + if (data->found) { + ScintillaObject *sci = doc->editor->sci; + + sci_start_undo_action (sci); + + if (data->new_lines > 0) { + gint pos = sci_get_position_from_line (sci, data->new_start - 1); + sci_set_target_start (sci, pos); + pos = sci_get_position_from_line (sci, data->new_start + data->new_lines - 1); + sci_set_target_end (sci, pos); + sci_replace_target (sci, "", FALSE); + } + + if (data->old_lines > 0) { + gint line = sci_get_current_line (sci); + gint pos; + + if (data->new_lines == 0) { + line++; /* marker for deleted hunk is on previous line */ + } + pos = sci_get_position_from_line (sci, line); + + insert_buf_range (doc, contents, pos, + data->old_start - 1, + data->old_lines); + } + + sci_scroll_caret (sci); + + sci_end_undo_action (sci); + } + } + + g_slice_free1 (sizeof *data, data); +} + +static void +on_kb_undo_hunk (guint kb) +{ + GeanyDocument *doc = document_get_current (); + + if (doc) { + UndoHunkData *data = g_slice_alloc (sizeof *data); + + data->doc_id = doc->id; + data->line = sci_get_current_line (doc->editor->sci) + 1; + data->found = FALSE; + + get_cached_blob_contents_async (doc->real_path, doc->id, FALSE, + undo_hunk_cb, data); + } +} + /* --- configuration loading and saving --- */ static void @@ -1272,6 +1406,8 @@ plugin_init (GeanyData *data) "goto-prev-hunk", _("Go to the previous hunk"), NULL); keybindings_set_item (kb_group, KB_GOTO_NEXT_HUNK, on_kb_goto_next_hunk, 0, 0, "goto-next-hunk", _("Go to the next hunk"), NULL); + keybindings_set_item (kb_group, KB_UNDO_HUNK, on_kb_undo_hunk, 0, 0, + "undo-hunk", _("Undo hunk at the cursor position"), NULL); plugin_signal_connect (geany_plugin, NULL, "editor-notify", TRUE, G_CALLBACK (on_editor_notify), NULL); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] ec0053: git-changebar: correctly display diff when first line removed
by Jiří Techet 19 Aug '17

19 Aug '17

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 22 May 2017 13:06:14 UTC Commit: ec00539e86e6a2599e6d40e653e26c10dc2afaf8 https://github.com/geany/geany-plugins/commit/ec00539e86e6a2599e6d40e653e26… Log Message: ----------- git-changebar: correctly display diff when first line removed Diffs for removed lines are shown on previous line - this works well except the first line where there's no previous line so nothing is displayed. This patch adds corresponding tests to the code and shows diffs for the first line on the first line. It also fixes related problems with going to previous/next hunk and undoing hunks. Modified Paths: -------------- git-changebar/src/gcb-plugin.c Modified: git-changebar/src/gcb-plugin.c 32 lines changed, 22 insertions(+), 10 deletions(-) =================================================================== @@ -123,6 +123,7 @@ struct UndoHunkData { guint doc_id; gint line; gboolean found; + gboolean first_line_removed; gint old_start; gint old_lines; gint new_start; @@ -731,16 +732,17 @@ diff_hunk_cb (const git_diff_delta *delta, void *data) { ScintillaObject *sci = data; + gint line; if (hunk->new_lines > 0) { - gint line; guint marker = hunk->old_lines > 0 ? MARKER_LINE_CHANGED : MARKER_LINE_ADDED; for (line = hunk->new_start; line < hunk->new_start + hunk->new_lines; line++) { scintilla_send_message (sci, SCI_MARKERADD, line - 1, G_markers[marker].num); } } else { - scintilla_send_message (sci, SCI_MARKERADD, hunk->new_start - 1, + line = (hunk->new_start == 0) ? 0 : hunk->new_start - 1; + scintilla_send_message (sci, SCI_MARKERADD, line, G_markers[MARKER_LINE_REMOVED].num); } @@ -820,6 +822,12 @@ get_widget_for_buf_range (GeanyDocument *doc, return GTK_WIDGET (sci); } +static gboolean +is_first_line_removed (gint line, gint new_hunk_start, gint new_hunk_lines) +{ + return line == 1 && new_hunk_start == 0 && new_hunk_lines == 0; +} + static int tooltip_diff_hunk_cb (const git_diff_delta *delta, const git_diff_hunk *hunk, @@ -832,8 +840,9 @@ tooltip_diff_hunk_cb (const git_diff_delta *delta, } if (hunk->old_lines > 0 && - thd->line >= hunk->new_start && - thd->line < hunk->new_start + MAX (1, hunk->new_lines)) { + (is_first_line_removed (thd->line, hunk->new_start, hunk->new_lines) || + (thd->line >= hunk->new_start && + thd->line < hunk->new_start + MAX (1, hunk->new_lines)))) { GtkWidget *old = get_widget_for_buf_range (thd->doc, thd->buf, hunk->old_start - 1, hunk->old_lines); @@ -1044,13 +1053,13 @@ goto_next_hunk_diff_hunk_cb (const git_diff_delta *delta, if (data->next_line >= 0) { return 1; } else if (data->line < hunk->new_start - 1) { - data->next_line = hunk->new_start - 1; + data->next_line = (hunk->new_start == 0) ? 0 : hunk->new_start - 1; } break; case KB_GOTO_PREV_HUNK: if (data->line > hunk->new_start - 1 + MAX (hunk->new_lines - 1, 0)) { - data->next_line = hunk->new_start - 1; + data->next_line = (hunk->new_start == 0) ? 0 : hunk->new_start - 1; } break; } @@ -1142,14 +1151,17 @@ undo_hunk_diff_hunk_cb (const git_diff_delta *delta, void *udata) { UndoHunkData *data = udata; + gboolean first_line_removed = is_first_line_removed (data->line, hunk->new_start, hunk->new_lines); - if (data->line >= hunk->new_start && - data->line < hunk->new_start + MAX (1, hunk->new_lines)) { + if (first_line_removed || + (data->line >= hunk->new_start && + data->line < hunk->new_start + MAX (1, hunk->new_lines))) { data->old_start = hunk->old_start; data->old_lines = hunk->old_lines; data->new_start = hunk->new_start; data->new_lines = hunk->new_lines; data->found = TRUE; + data->first_line_removed = first_line_removed; return 1; } @@ -1184,8 +1196,8 @@ undo_hunk_cb (const gchar *path, gint line = sci_get_current_line (sci); gint pos; - if (data->new_lines == 0) { - line++; /* marker for deleted hunk is on previous line */ + if (data->new_lines == 0 && !data->first_line_removed) { + line++; /* marker for deleted hunk is on previous line except the 1st line */ } pos = sci_get_position_from_line (sci, line); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 59118d: Merge pull request #531 from techee/sidebar_undo
by Frank Lanitz 19 Aug '17

19 Aug '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sat, 19 Aug 2017 13:46:12 UTC Commit: 59118d86ef8853943dec74c9f6d6fad9a535931a https://github.com/geany/geany-plugins/commit/59118d86ef8853943dec74c9f6d6f… Log Message: ----------- Merge pull request #531 from techee/sidebar_undo git-changebar: Add the possibility to undo hunk at cursor position Modified Paths: -------------- git-changebar/README git-changebar/src/gcb-plugin.c Modified: git-changebar/README 8 lines changed, 6 insertions(+), 2 deletions(-) =================================================================== @@ -8,8 +8,8 @@ Git Change Bar About ===== -This plugin highlights uncommitted changes to files tracked with Git, and -allows to navigate through the hunks. +This plugin highlights uncommitted changes to files tracked with Git, +allows to navigate through the hunks and undo them. Requirements @@ -38,6 +38,10 @@ To navigate through the hunks of the current file, you need to configure the plugin's *Go to next hunk* and *Go to previous hunk* keybindings in Geany's preferences dialog. +Hunks can also be undone by either setting a cursor at a line with a hunk and +invoking the *Undo hunk at the cursor position* or by right-clicking in the +editor where the hunk is located and selecting *Undo Git hunk* from the popup +menu. License ======= Modified: git-changebar/src/gcb-plugin.c 249 lines changed, 240 insertions(+), 9 deletions(-) =================================================================== @@ -68,7 +68,13 @@ PLUGIN_SET_TRANSLATABLE_INFO ( #define RESOURCES_ALLOCATED_QTAG \ (g_quark_from_string (PLUGIN"/git-resources-allocated")) +#define UNDO_LINE_QTAG \ + (g_quark_from_string (PLUGIN"/git-undo-line")) +#define DOC_ID_QTAG \ + (g_quark_from_string (PLUGIN"/git-doc-id")) +#define REMOVED_MARKER_POS(pos) \ + ((pos) == 0 ? 0 : (pos) - 1) enum { MARKER_LINE_ADDED, @@ -80,6 +86,7 @@ enum { enum { KB_GOTO_PREV_HUNK, KB_GOTO_NEXT_HUNK, + KB_UNDO_HUNK, KB_COUNT }; @@ -117,6 +124,16 @@ struct GotoNextHunkData { gint next_line; }; +typedef struct UndoHunkData UndoHunkData; +struct UndoHunkData { + guint doc_id; + gint line; + gboolean found; + gint old_start; + gint old_lines; + gint new_start; + gint new_lines; +}; static void on_git_repo_changed (GFileMonitor *monitor, GFile *file, @@ -155,6 +172,7 @@ static GAsyncQueue *G_queue = NULL; static GThread *G_thread = NULL; static gulong G_source_id = 0; static gboolean G_monitoring_enabled = TRUE; +static GtkWidget *G_undo_menu_item = NULL; static struct { gint num; gint style; @@ -591,7 +609,7 @@ release_resources (ScintillaObject *sci) /* checks whether @encoding needs to be converted to UTF-8 */ static gboolean -encoding_needs_coversion (const gchar *encoding) +encoding_needs_conversion (const gchar *encoding) { return (encoding && ! utils_str_equal (encoding, "UTF-8") && @@ -694,7 +712,7 @@ diff_buf_to_doc (const git_buf *old_buf, free_buf = add_utf8_bom (&buf, &len, free_buf); } /* convert the buffer back to in-file encoding if necessary */ - if (encoding_needs_coversion (doc->encoding)) { + if (encoding_needs_conversion (doc->encoding)) { free_buf = convert_encoding_inplace (&buf, &len, free_buf, doc->encoding, "UTF-8", NULL); } @@ -720,16 +738,17 @@ diff_hunk_cb (const git_diff_delta *delta, void *data) { ScintillaObject *sci = data; + gint line; if (hunk->new_lines > 0) { - gint line; guint marker = hunk->old_lines > 0 ? MARKER_LINE_CHANGED : MARKER_LINE_ADDED; for (line = hunk->new_start; line < hunk->new_start + hunk->new_lines; line++) { scintilla_send_message (sci, SCI_MARKERADD, line - 1, G_markers[marker].num); } } else { - scintilla_send_message (sci, SCI_MARKERADD, hunk->new_start - 1, + line = REMOVED_MARKER_POS (hunk->new_start); + scintilla_send_message (sci, SCI_MARKERADD, line, G_markers[MARKER_LINE_REMOVED].num); } @@ -773,7 +792,7 @@ get_widget_for_buf_range (GeanyDocument *doc, } /* convert the buffer to UTF-8 if necessary */ - if (encoding_needs_coversion (doc->encoding)) { + if (encoding_needs_conversion (doc->encoding)) { free_buf = convert_encoding_inplace (&buf, &buf_len, free_buf, "UTF-8", doc->encoding, NULL); } @@ -812,6 +831,12 @@ get_widget_for_buf_range (GeanyDocument *doc, return GTK_WIDGET (sci); } +static gboolean +is_first_line_removed (gint line, gint new_hunk_start, gint new_hunk_lines) +{ + return line == 1 && new_hunk_start == 0 && new_hunk_lines == 0; +} + static int tooltip_diff_hunk_cb (const git_diff_delta *delta, const git_diff_hunk *hunk, @@ -824,8 +849,9 @@ tooltip_diff_hunk_cb (const git_diff_delta *delta, } if (hunk->old_lines > 0 && - thd->line >= hunk->new_start && - thd->line < hunk->new_start + MAX (1, hunk->new_lines)) { + (is_first_line_removed (thd->line, hunk->new_start, hunk->new_lines) || + (thd->line >= hunk->new_start && + thd->line < hunk->new_start + MAX (1, hunk->new_lines)))) { GtkWidget *old = get_widget_for_buf_range (thd->doc, thd->buf, hunk->old_start - 1, hunk->old_lines); @@ -900,6 +926,8 @@ update_diff (const gchar *path, } } + gtk_widget_set_visible (G_undo_menu_item, contents != NULL); + if (contents && (allocated || allocate_resources (sci))) { diff_buf_to_doc (contents, doc, diff_hunk_cb, sci); } else if (! contents && allocated) { @@ -962,6 +990,8 @@ update_diff_push (GeanyDocument *doc, { g_return_if_fail (DOC_VALID (doc)); + gtk_widget_hide (G_undo_menu_item); + if (G_source_id) { g_source_remove (G_source_id); G_source_id = 0; @@ -1036,13 +1066,13 @@ goto_next_hunk_diff_hunk_cb (const git_diff_delta *delta, if (data->next_line >= 0) { return 1; } else if (data->line < hunk->new_start - 1) { - data->next_line = hunk->new_start - 1; + data->next_line = REMOVED_MARKER_POS (hunk->new_start); } break; case KB_GOTO_PREV_HUNK: if (data->line > hunk->new_start - 1 + MAX (hunk->new_lines - 1, 0)) { - data->next_line = hunk->new_start - 1; + data->next_line = REMOVED_MARKER_POS (hunk->new_start); } break; } @@ -1089,6 +1119,194 @@ on_kb_goto_next_hunk (guint kb) } } +static void +insert_buf_range (GeanyDocument *doc, + const git_buf *old_contents, + gint pos, + gint old_start, + gint old_lines) +{ + ScintillaObject *old_sci = editor_create_widget (doc->editor); + gchar *old_buf = old_contents->ptr; + gsize old_buf_len = old_contents->size; + gboolean free_buf = FALSE; + gint old_pos_start; + gint old_pos_end; + gchar *old_range; + + /* convert the buffer to UTF-8 if necessary */ + if (encoding_needs_conversion (doc->encoding)) { + free_buf = convert_encoding_inplace (&old_buf, &old_buf_len, free_buf, + "UTF-8", doc->encoding, NULL); + } + + scintilla_send_message (old_sci, SCI_ADDTEXT, old_buf_len, (glong) old_buf); + + old_pos_start = sci_get_position_from_line (old_sci, old_start); + old_pos_end = sci_get_position_from_line (old_sci, old_start + old_lines); + old_range = sci_get_contents_range (old_sci, old_pos_start, old_pos_end); + + sci_insert_text (doc->editor->sci, pos, old_range); + + g_free (old_range); + + if (free_buf) { + g_free (old_buf); + } + + g_object_ref_sink (old_sci); + g_object_unref (old_sci); +} + +static int +undo_hunk_diff_hunk_cb (const git_diff_delta *delta, + const git_diff_hunk *hunk, + void *udata) +{ + UndoHunkData *data = udata; + + if (is_first_line_removed (data->line, hunk->new_start, hunk->new_lines) || + (data->line >= hunk->new_start && + data->line < hunk->new_start + MAX (1, hunk->new_lines))) { + data->old_start = hunk->old_start; + data->old_lines = hunk->old_lines; + data->new_start = hunk->new_start; + data->new_lines = hunk->new_lines; + data->found = TRUE; + return 1; + } + + return 0; +} + +static void +undo_hunk_cb (const gchar *path, + git_buf *contents, + gpointer udata) +{ + UndoHunkData *data = udata; + GeanyDocument *doc = document_get_current (); + + if (doc && doc->id == data->doc_id && contents) { + diff_buf_to_doc (contents, doc, undo_hunk_diff_hunk_cb, data); + + if (data->found) { + ScintillaObject *sci = doc->editor->sci; + gint line = data->new_start - (data->new_lines ? 1 : 0); + gint pos = sci_get_position_from_line (sci, line); + + sci_start_undo_action (sci); + + if (data->new_lines > 0) { + sci_set_target_start (sci, pos); + pos = sci_get_position_from_line (sci, line + data->new_lines); + sci_set_target_end (sci, pos); + sci_replace_target (sci, "", FALSE); + } + + if (data->old_lines > 0) { + pos = sci_get_position_from_line (sci, line); + insert_buf_range (doc, contents, pos, + data->old_start - 1, + data->old_lines); + + pos = sci_get_position_from_line (sci, line + data->old_lines); + sci_set_current_position (sci, pos, FALSE); + } + + scintilla_send_message (sci, SCI_SCROLLRANGE, + sci_get_position_from_line (sci, line), + pos); + + sci_end_undo_action (sci); + } + } + + g_slice_free1 (sizeof *data, data); +} + +static void +undo_hunk (GeanyDocument *doc, + gint line) +{ + UndoHunkData *data = g_slice_alloc (sizeof *data); + + data->doc_id = doc->id; + data->line = line + 1; + data->found = FALSE; + + get_cached_blob_contents_async (doc->real_path, doc->id, FALSE, + undo_hunk_cb, data); +} + +static void +on_kb_undo_hunk (guint kb) +{ + GeanyDocument *doc = document_get_current (); + + if (doc) { + undo_hunk (doc, sci_get_current_line (doc->editor->sci)); + } +} + +static void +on_undo_hunk_activate (GtkWidget *widget, + gpointer user_data) +{ + GeanyDocument *doc = document_get_current (); + gpointer doc_id = g_object_get_qdata (G_OBJECT (widget), DOC_ID_QTAG); + + if (doc && doc->id == GPOINTER_TO_UINT (doc_id) && + gtk_widget_get_sensitive (widget)) { + gpointer line = g_object_get_qdata (G_OBJECT (widget), UNDO_LINE_QTAG); + + undo_hunk (doc, GPOINTER_TO_INT (line)); + } +} + +static void +check_undo_hunk_cb (const gchar *path, + git_buf *contents, + gpointer udata) +{ + UndoHunkData *data = udata; + GeanyDocument *doc = document_get_current (); + + if (doc && doc->id == data->doc_id && contents) { + diff_buf_to_doc (contents, doc, undo_hunk_diff_hunk_cb, data); + if (data->found) { + gtk_widget_set_sensitive (G_undo_menu_item, TRUE); + g_object_set_qdata (G_OBJECT (G_undo_menu_item), UNDO_LINE_QTAG, + GINT_TO_POINTER (data->line - 1)); + g_object_set_qdata (G_OBJECT (G_undo_menu_item), DOC_ID_QTAG, + GUINT_TO_POINTER (data->doc_id)); + } + } + + g_slice_free1 (sizeof *data, data); +} + +static void +on_update_editor_menu (GObject *object, + const gchar *word, + gint pos, + GeanyDocument *doc, + gpointer user_data) +{ + gtk_widget_set_sensitive (G_undo_menu_item, FALSE); + + if (doc) { + UndoHunkData *data = g_slice_alloc (sizeof *data); + + data->doc_id = doc->id; + data->line = sci_get_line_from_position (doc->editor->sci, pos) + 1; + data->found = FALSE; + + get_cached_blob_contents_async (doc->real_path, doc->id, FALSE, + check_undo_hunk_cb, data); + } +} + /* --- configuration loading and saving --- */ static void @@ -1270,14 +1488,25 @@ plugin_init (GeanyData *data) load_config (); + G_undo_menu_item = gtk_menu_item_new_with_label (_("Undo Git hunk")); + g_signal_connect (G_undo_menu_item, "activate", + G_CALLBACK (on_undo_hunk_activate), NULL); + gtk_container_add (GTK_CONTAINER (data->main_widgets->editor_menu), + G_undo_menu_item); + kb_group = plugin_set_key_group (geany_plugin, PLUGIN, KB_COUNT, NULL); keybindings_set_item (kb_group, KB_GOTO_PREV_HUNK, on_kb_goto_next_hunk, 0, 0, "goto-prev-hunk", _("Go to the previous hunk"), NULL); keybindings_set_item (kb_group, KB_GOTO_NEXT_HUNK, on_kb_goto_next_hunk, 0, 0, "goto-next-hunk", _("Go to the next hunk"), NULL); + keybindings_set_item (kb_group, KB_UNDO_HUNK, on_kb_undo_hunk, 0, 0, + "undo-hunk", _("Undo hunk at the cursor position"), + G_undo_menu_item); plugin_signal_connect (geany_plugin, NULL, "editor-notify", TRUE, G_CALLBACK (on_editor_notify), NULL); + plugin_signal_connect (geany_plugin, NULL, "update-editor-menu", TRUE, + G_CALLBACK (on_update_editor_menu), NULL); plugin_signal_connect (geany_plugin, NULL, "document-activate", TRUE, G_CALLBACK (on_document_activate), NULL); plugin_signal_connect (geany_plugin, NULL, "document-reload", TRUE, @@ -1299,6 +1528,8 @@ plugin_cleanup (void) { guint i = 0; + gtk_widget_destroy (G_undo_menu_item); + if (G_source_id) { g_source_remove (G_source_id); G_source_id = 0; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] e5e7bf: Merge pull request #597 from elextr/patch-3
by Frank Lanitz 19 Aug '17

19 Aug '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sat, 19 Aug 2017 13:20:05 UTC Commit: e5e7bf4cab85cf89bae18d04b973108d9ce6d9e3 https://github.com/geany/geany-plugins/commit/e5e7bf4cab85cf89bae18d04b9731… Log Message: ----------- Merge pull request #597 from elextr/patch-3 Update travis to system with c++11 compiler Modified Paths: -------------- .travis.yml Modified: .travis.yml 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,7 @@ language: c +dist: trusty + sudo: false compiler: @@ -48,7 +50,7 @@ addons: - python-gtk2-dev # geanyvc - libgtkspell-dev - - libgtkspell-3-dev + - libgtkspell3-3-dev # geaniuspaste/updatechecker - libsoup2.4-dev # git-changebar -------------- 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 August 2017