Plugins-Commits

plugins-commits@lists.geany.org

1 participants
5473 discussions

[geany/geany-plugins] f1dff7: vimode: Enable '.' to also repeat last inserted text
by Jiří Techet 29 Sep '21

29 Sep '21

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 31 Aug 2021 10:24:31 UTC Commit: f1dff74db4844f8314420eea35c98335cb350559 https://github.com/geany/geany-plugins/commit/f1dff74db4844f8314420eea35c98… Log Message: ----------- vimode: Enable '.' to also repeat last inserted text Currently, '.' only repeats the last command inserted in the command mode and doesn't repeat text inserted in the (just exited) insert mode which vim does. Since we already support commands like 10iwrite_text_to_be_repeated_10_times<esc> we can reuse the code also for the '.' command. Modified Paths: -------------- vimode/src/cmd-runner.c vimode/src/vi.c Modified: vimode/src/cmd-runner.c 23 lines changed, 17 insertions(+), 6 deletions(-) =================================================================== @@ -611,14 +611,25 @@ static gboolean perform_repeat_cmd(CmdContext *ctx) gint i; def = get_cmd_to_run(ctx->repeat_kpl, edit_cmds, FALSE); - if (!def) - return FALSE; - num = num == -1 ? 1 : num; - for (i = 0; i < num; i++) - perform_cmd(def, ctx); + if (def) { + for (i = 0; i < num; i++) + perform_cmd(def, ctx); + return TRUE; + } + else if (ctx->insert_buf_len > 0) { + gint pos; + + SSM(ctx->sci, SCI_BEGINUNDOACTION, 0, 0); + for (i = 0; i < num; i++) + SSM(ctx->sci, SCI_ADDTEXT, ctx->insert_buf_len, (sptr_t) ctx->insert_buf); + pos = SSM(ctx->sci, SCI_GETCURRENTPOS, 0, 0); + SET_POS(ctx->sci, PREV(ctx->sci, pos), FALSE); + SSM(ctx->sci, SCI_ENDUNDOACTION, 0, 0); + return TRUE; + } - return TRUE; + return FALSE; } Modified: vimode/src/vi.c 6 lines changed, 4 insertions(+), 2 deletions(-) =================================================================== @@ -109,8 +109,6 @@ static void repeat_insert(gboolean replace) SSM(sci, SCI_ENDUNDOACTION, 0, 0); } ctx.num = 1; - ctx.insert_buf_len = 0; - ctx.insert_buf[0] = '\0'; ctx.newline_insert = FALSE; } @@ -156,6 +154,10 @@ void vi_set_mode(ViMode mode) gint start_pos = SSM(sci, SCI_POSITIONFROMLINE, GET_CUR_LINE(sci), 0); if (pos > start_pos) SET_POS(sci, PREV(sci, pos), FALSE); + + /* erase kpl so '.' command repeats last inserted text and not command */ + g_slist_free_full(ctx.kpl, g_free); + ctx.kpl = NULL; } else if (VI_IS_VISUAL(prev_mode)) SSM(sci, SCI_SETEMPTYSELECTION, pos, 0); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 25291e: vimode: increase the size of the buffer for recording insert mode text
by Jiří Techet 29 Sep '21

29 Sep '21

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 07 Sep 2021 11:08:05 UTC Commit: 25291ea004e3430d1ad8947d90f552e5d40456fa https://github.com/geany/geany-plugins/commit/25291ea004e3430d1ad8947d90f55… Log Message: ----------- vimode: increase the size of the buffer for recording insert mode text This should be more than enough for manually inserted text and a reasonable amount for pasted text. Modified Paths: -------------- vimode/src/context.h Modified: vimode/src/context.h 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -22,7 +22,7 @@ #include "vi.h" #include "sci.h" -#define INSERT_BUF_LEN 4096 +#define INSERT_BUF_LEN 131072 typedef struct { @@ -54,7 +54,7 @@ typedef struct gint num; /* buffer used in insert/replace mode to record entered text so it can be - * copied N times when e.g. 'i' is preceded by a number */ + * copied N times when e.g. 'i' is preceded by a number or when using '.' */ gchar insert_buf[INSERT_BUF_LEN]; gint insert_buf_len; } CmdContext; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 00c2a0: Merge pull request #1102 from techee/vim_repeat_insert
by Frank Lanitz 29 Sep '21

29 Sep '21

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Wed, 29 Sep 2021 17:11:12 UTC Commit: 00c2a030e722cda45d7ce77e1b8431a773f49b77 https://github.com/geany/geany-plugins/commit/00c2a030e722cda45d7ce77e1b843… Log Message: ----------- Merge pull request #1102 from techee/vim_repeat_insert vimode: Enable '.' to also repeat last inserted text Modified Paths: -------------- vimode/src/cmd-runner.c vimode/src/context.h vimode/src/vi.c Modified: vimode/src/cmd-runner.c 23 lines changed, 17 insertions(+), 6 deletions(-) =================================================================== @@ -633,14 +633,25 @@ static gboolean perform_repeat_cmd(CmdContext *ctx) gint i; def = get_cmd_to_run(ctx->repeat_kpl, edit_cmds, FALSE); - if (!def) - return FALSE; - num = num == -1 ? 1 : num; - for (i = 0; i < num; i++) - perform_cmd(def, ctx); + if (def) { + for (i = 0; i < num; i++) + perform_cmd(def, ctx); + return TRUE; + } + else if (ctx->insert_buf_len > 0) { + gint pos; + + SSM(ctx->sci, SCI_BEGINUNDOACTION, 0, 0); + for (i = 0; i < num; i++) + SSM(ctx->sci, SCI_ADDTEXT, ctx->insert_buf_len, (sptr_t) ctx->insert_buf); + pos = SSM(ctx->sci, SCI_GETCURRENTPOS, 0, 0); + SET_POS(ctx->sci, PREV(ctx->sci, pos), FALSE); + SSM(ctx->sci, SCI_ENDUNDOACTION, 0, 0); + return TRUE; + } - return TRUE; + return FALSE; } Modified: vimode/src/context.h 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -22,7 +22,7 @@ #include "vi.h" #include "sci.h" -#define INSERT_BUF_LEN 4096 +#define INSERT_BUF_LEN 131072 typedef struct { @@ -54,7 +54,7 @@ typedef struct gint num; /* buffer used in insert/replace mode to record entered text so it can be - * copied N times when e.g. 'i' is preceded by a number */ + * copied N times when e.g. 'i' is preceded by a number or when using '.' */ gchar insert_buf[INSERT_BUF_LEN]; gint insert_buf_len; } CmdContext; Modified: vimode/src/vi.c 6 lines changed, 4 insertions(+), 2 deletions(-) =================================================================== @@ -109,8 +109,6 @@ static void repeat_insert(gboolean replace) SSM(sci, SCI_ENDUNDOACTION, 0, 0); } ctx.num = 1; - ctx.insert_buf_len = 0; - ctx.insert_buf[0] = '\0'; ctx.newline_insert = FALSE; } @@ -156,6 +154,10 @@ void vi_set_mode(ViMode mode) gint start_pos = SSM(sci, SCI_POSITIONFROMLINE, GET_CUR_LINE(sci), 0); if (pos > start_pos) SET_POS(sci, PREV(sci, pos), FALSE); + + /* erase kpl so '.' command repeats last inserted text and not command */ + g_slist_free_full(ctx.kpl, g_free); + ctx.kpl = NULL; } else if (VI_IS_VISUAL(prev_mode)) SSM(sci, SCI_SETEMPTYSELECTION, pos, 0); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 718c7b: vimode: fix line operation problems when NL is missing at EOF
by Jiří Techet 29 Sep '21

29 Sep '21

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 01 Sep 2021 13:44:09 UTC Commit: 718c7bef7e49b943aa922d7d4901a7644097b527 https://github.com/geany/geany-plugins/commit/718c7bef7e49b943aa922d7d4901a… Log Message: ----------- vimode: fix line operation problems when NL is missing at EOF This patch adds \n if it's missing at the EOF before line operations like yank, delete or paste are parformed to make sure these operations always work the same way. If added, the extra \n is removed from the file when the operation is completed. Modified Paths: -------------- vimode/src/cmds/edit.c Modified: vimode/src/cmds/edit.c 45 lines changed, 45 insertions(+), 0 deletions(-) =================================================================== @@ -81,24 +81,60 @@ void cmd_clear_right(CmdContext *c, CmdParams *p) } +static gboolean insert_eof_nl_if_missing(CmdParams *p) +{ + gint pos = SSM(p->sci, SCI_GETCURRENTPOS, 0, 0); + gint last_line = SSM(p->sci, SCI_GETLINECOUNT, 0, 0); + gint line_start_pos = SSM(p->sci, SCI_POSITIONFROMLINE, last_line, 0); + gint line_end_pos = SSM(p->sci, SCI_GETLINEENDPOSITION, last_line, 0); + + if (line_start_pos == line_end_pos) { + SET_POS(p->sci, line_end_pos, FALSE); + SSM(p->sci, SCI_NEWLINE, 0, 0); + SET_POS(p->sci, pos, FALSE); + return TRUE; + } + return FALSE; +} + + +static void remove_char_from_eof(CmdParams *p) +{ + gint pos = SSM(p->sci, SCI_GETCURRENTPOS, 0, 0); + gint last_line = SSM(p->sci, SCI_GETLINECOUNT, 0, 0); + gint line_end_pos = SSM(p->sci, SCI_GETLINEENDPOSITION, last_line, 0); + + SET_POS(p->sci, line_end_pos, FALSE); + SSM(p->sci, SCI_DELETEBACK, 0, 0); + SET_POS(p->sci, pos, FALSE); +} + + void cmd_delete_line(CmdContext *c, CmdParams *p) { + gboolean nl_inserted = insert_eof_nl_if_missing(p); gint num = get_line_number_rel(p->sci, p->num); gint end = SSM(p->sci, SCI_POSITIONFROMLINE, num, 0); c->line_copy = TRUE; SSM(p->sci, SCI_COPYRANGE, p->line_start_pos, end); SSM(p->sci, SCI_DELETERANGE, p->line_start_pos, end - p->line_start_pos); + if (nl_inserted) + remove_char_from_eof(p); + goto_nonempty(p->sci, GET_CUR_LINE(p->sci), TRUE); } void cmd_copy_line(CmdContext *c, CmdParams *p) { + gboolean nl_inserted = insert_eof_nl_if_missing(p); gint num = get_line_number_rel(p->sci, p->num); gint end = SSM(p->sci, SCI_POSITIONFROMLINE, num, 0); c->line_copy = TRUE; SSM(p->sci, SCI_COPYRANGE, p->line_start_pos, end); + if (nl_inserted) + remove_char_from_eof(p); } @@ -146,13 +182,17 @@ void cmd_redo(CmdContext *c, CmdParams *p) static void paste(CmdContext *c, CmdParams *p, gboolean after) { + gboolean nl_inserted = FALSE; gint pos; gint i; if (c->line_copy) { if (after) + { + nl_inserted = insert_eof_nl_if_missing(p); pos = SSM(p->sci, SCI_POSITIONFROMLINE, p->line+1, 0); + } else pos = p->line_start_pos; } @@ -167,7 +207,12 @@ static void paste(CmdContext *c, CmdParams *p, gboolean after) for (i = 0; i < p->num; i++) SSM(p->sci, SCI_PASTE, 0, 0); if (c->line_copy) + { SET_POS(p->sci, pos, TRUE); + if (nl_inserted) + remove_char_from_eof(p); + goto_nonempty(p->sci, GET_CUR_LINE(p->sci), TRUE); + } else if (!VI_IS_INSERT(vi_get_mode())) SSM(p->sci, SCI_CHARLEFT, 0, 0); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] ae19ca: Merge pull request #1103 from techee/vim_eof_problem
by Frank Lanitz 29 Sep '21

29 Sep '21

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Wed, 29 Sep 2021 17:11:06 UTC Commit: ae19ca93932b2c0a29c44bb1570951ee4abe9307 https://github.com/geany/geany-plugins/commit/ae19ca93932b2c0a29c44bb157095… Log Message: ----------- Merge pull request #1103 from techee/vim_eof_problem vimode: fix line operation problems when NL is missing at EOF Modified Paths: -------------- vimode/src/cmds/edit.c Modified: vimode/src/cmds/edit.c 45 lines changed, 45 insertions(+), 0 deletions(-) =================================================================== @@ -81,24 +81,60 @@ void cmd_clear_right(CmdContext *c, CmdParams *p) } +static gboolean insert_eof_nl_if_missing(CmdParams *p) +{ + gint pos = SSM(p->sci, SCI_GETCURRENTPOS, 0, 0); + gint last_line = SSM(p->sci, SCI_GETLINECOUNT, 0, 0); + gint line_start_pos = SSM(p->sci, SCI_POSITIONFROMLINE, last_line, 0); + gint line_end_pos = SSM(p->sci, SCI_GETLINEENDPOSITION, last_line, 0); + + if (line_start_pos == line_end_pos) { + SET_POS(p->sci, line_end_pos, FALSE); + SSM(p->sci, SCI_NEWLINE, 0, 0); + SET_POS(p->sci, pos, FALSE); + return TRUE; + } + return FALSE; +} + + +static void remove_char_from_eof(CmdParams *p) +{ + gint pos = SSM(p->sci, SCI_GETCURRENTPOS, 0, 0); + gint last_line = SSM(p->sci, SCI_GETLINECOUNT, 0, 0); + gint line_end_pos = SSM(p->sci, SCI_GETLINEENDPOSITION, last_line, 0); + + SET_POS(p->sci, line_end_pos, FALSE); + SSM(p->sci, SCI_DELETEBACK, 0, 0); + SET_POS(p->sci, pos, FALSE); +} + + void cmd_delete_line(CmdContext *c, CmdParams *p) { + gboolean nl_inserted = insert_eof_nl_if_missing(p); gint num = get_line_number_rel(p->sci, p->num); gint end = SSM(p->sci, SCI_POSITIONFROMLINE, num, 0); c->line_copy = TRUE; SSM(p->sci, SCI_COPYRANGE, p->line_start_pos, end); SSM(p->sci, SCI_DELETERANGE, p->line_start_pos, end - p->line_start_pos); + if (nl_inserted) + remove_char_from_eof(p); + goto_nonempty(p->sci, GET_CUR_LINE(p->sci), TRUE); } void cmd_copy_line(CmdContext *c, CmdParams *p) { + gboolean nl_inserted = insert_eof_nl_if_missing(p); gint num = get_line_number_rel(p->sci, p->num); gint end = SSM(p->sci, SCI_POSITIONFROMLINE, num, 0); c->line_copy = TRUE; SSM(p->sci, SCI_COPYRANGE, p->line_start_pos, end); + if (nl_inserted) + remove_char_from_eof(p); } @@ -146,13 +182,17 @@ void cmd_redo(CmdContext *c, CmdParams *p) static void paste(CmdContext *c, CmdParams *p, gboolean after) { + gboolean nl_inserted = FALSE; gint pos; gint i; if (c->line_copy) { if (after) + { + nl_inserted = insert_eof_nl_if_missing(p); pos = SSM(p->sci, SCI_POSITIONFROMLINE, p->line+1, 0); + } else pos = p->line_start_pos; } @@ -167,7 +207,12 @@ static void paste(CmdContext *c, CmdParams *p, gboolean after) for (i = 0; i < p->num; i++) SSM(p->sci, SCI_PASTE, 0, 0); if (c->line_copy) + { SET_POS(p->sci, pos, TRUE); + if (nl_inserted) + remove_char_from_eof(p); + goto_nonempty(p->sci, GET_CUR_LINE(p->sci), TRUE); + } else if (!VI_IS_INSERT(vi_get_mode())) SSM(p->sci, SCI_CHARLEFT, 0, 0); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 153c3a: vimode: Add special handling to include destination char for some commands
by Jiří Techet 29 Sep '21

29 Sep '21

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 01 Sep 2021 19:50:05 UTC Commit: 153c3aaab23ec97436c53f6a35d9e82862bd44d5 https://github.com/geany/geany-plugins/commit/153c3aaab23ec97436c53f6a35d9e… Log Message: ----------- vimode: Add special handling to include destination char for some commands For abcde; simple 't;' does the right thing and places the cursor on top of character 'e' just before ';'. However, for composed commands such as 'dt;', vim also deletes the character 'e' which vimode currently doesn't. Vim behaves in a bit inconsistent way regarding this behavior - while for 'dw' (delete all until next word) it doesn't delete the first character of the next word onto which the cursor is placed, for 'de' (delete until next word end) it includes the final character of the deleted word. This behavior makes sense from the use case point of view but makes handling of such situations inconsistent. This patch lists functions which behave this way and includes the destination character to the selection. Fixes #1052. Modified Paths: -------------- vimode/src/cmd-runner.c Modified: vimode/src/cmd-runner.c 24 lines changed, 23 insertions(+), 1 deletions(-) =================================================================== @@ -167,6 +167,21 @@ typedef struct { /* END */ +/* From the above commands, these commands also include the character + * where the destionation movement ends for motion commands (e.g. 'de' will + * delete the word including the last character) */ +CmdDef include_dest_char_movement_cmds[] = { + {cmd_goto_next_char, GDK_KEY_f, 0, 0, 0, TRUE, FALSE}, + {cmd_goto_next_char_before, GDK_KEY_t, 0, 0, 0, TRUE, FALSE}, + {cmd_goto_next_word_end, GDK_KEY_e, 0, 0, 0, FALSE, FALSE}, + {cmd_goto_next_word_end_space, GDK_KEY_E, 0, 0, 0, FALSE, FALSE}, + {cmd_goto_previous_word, GDK_KEY_b, 0, 0, 0, FALSE, FALSE}, + {cmd_goto_previous_word_space, GDK_KEY_B, 0, 0, 0, FALSE, FALSE}, + {cmd_goto_matching_brace, GDK_KEY_percent, 0, 0, 0, FALSE, FALSE}, + {NULL, 0, 0, 0, 0, FALSE, FALSE} +}; + + CmdDef movement_cmds[] = { MOVEMENT_CMDS {NULL, 0, 0, 0, 0, FALSE, FALSE} @@ -567,7 +582,8 @@ static void perform_cmd(CmdDef *def, CmdContext *ctx) if (VI_IS_COMMAND(vi_get_mode())) { gboolean is_text_object_cmd = is_in_cmd_group(text_object_cmds, def); - if (is_text_object_cmd ||is_in_cmd_group(movement_cmds, def)) + gboolean is_include_dest_char_movement_cmd = is_in_cmd_group(include_dest_char_movement_cmds, def); + if (is_text_object_cmd || is_in_cmd_group(movement_cmds, def)) { def = get_cmd_to_run(top, operator_cmds, TRUE); if (def) @@ -585,6 +601,12 @@ static void perform_cmd(CmdDef *def, CmdContext *ctx) { sel_start = MIN(new_pos, orig_pos); sel_len = ABS(new_pos - orig_pos); + if (sel_len > 0 && is_include_dest_char_movement_cmd) + { + sel_len++; + if (new_pos < orig_pos) + sel_start--; + } } cmd_params_init(&param, ctx->sci, 1, FALSE, top, TRUE, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 21835b: vimode: document the newly added ex commands
by Jiří Techet 29 Sep '21

29 Sep '21

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 02 Sep 2021 19:43:01 UTC Commit: 21835b79c34e9967598bf7c862976def62698926 https://github.com/geany/geany-plugins/commit/21835b79c34e9967598bf7c862976… Log Message: ----------- vimode: document the newly added ex commands Modified Paths: -------------- vimode/README Modified: vimode/README 12 lines changed, 12 insertions(+), 0 deletions(-) =================================================================== @@ -550,16 +550,28 @@ a new command, please do not forget to update the table below.:: tag command action ------------------------------------------------------------------------------ :& :& repeat last ":substitute" + :< :< shift lines one 'shiftwidth' left + :> :> shift lines one 'shiftwidth' right + :copy :co[py] copy lines :cquit :cq[uit] quit Vim with an error code + :delete :d[elete] delete lines :exit :exi[t] same as ":xit" + :join :j[oin] join lines + :move :m[ove] move lines + :put :pu[t] insert contents of register in the text :quit :q[uit] quit current window (when one window quit Vim) :quitall :quita[ll] quit Vim :qall :qa[ll] quit Vim + :redo :red[o] redo one undone change :substitute :s[ubstitute] find and replace text + :t :t same as ":copy" + :undo :u[ndo] undo last change(s) :update :up[date] write buffer if modified :write :w[rite] write to a file :wall :wa[ll] write all (changed) buffers :wq :wq write to a file and quit window or Vim :wqall :wqa[ll] write all changed buffers and quit Vim :xit :x[it] write if buffer changed and quit window or Vim :xall :xa[ll] same as ":wqall" + :yank :y[ank] yank lines into a register + :~ :~ repeat last ":substitute" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] ef848d: Merge pull request #1104 from techee/vim_selection_char_problem
by Frank Lanitz 29 Sep '21

29 Sep '21

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Wed, 29 Sep 2021 17:10:45 UTC Commit: ef848d838858ce0150e86481d46bc75b3dd390a7 https://github.com/geany/geany-plugins/commit/ef848d838858ce0150e86481d46bc… Log Message: ----------- Merge pull request #1104 from techee/vim_selection_char_problem vimode: Add special handling to include destination char for some commands Modified Paths: -------------- vimode/src/cmd-runner.c Modified: vimode/src/cmd-runner.c 24 lines changed, 23 insertions(+), 1 deletions(-) =================================================================== @@ -167,6 +167,21 @@ typedef struct { /* END */ +/* From the above commands, these commands also include the character + * where the destionation movement ends for motion commands (e.g. 'de' will + * delete the word including the last character) */ +CmdDef include_dest_char_movement_cmds[] = { + {cmd_goto_next_char, GDK_KEY_f, 0, 0, 0, TRUE, FALSE}, + {cmd_goto_next_char_before, GDK_KEY_t, 0, 0, 0, TRUE, FALSE}, + {cmd_goto_next_word_end, GDK_KEY_e, 0, 0, 0, FALSE, FALSE}, + {cmd_goto_next_word_end_space, GDK_KEY_E, 0, 0, 0, FALSE, FALSE}, + {cmd_goto_previous_word, GDK_KEY_b, 0, 0, 0, FALSE, FALSE}, + {cmd_goto_previous_word_space, GDK_KEY_B, 0, 0, 0, FALSE, FALSE}, + {cmd_goto_matching_brace, GDK_KEY_percent, 0, 0, 0, FALSE, FALSE}, + {NULL, 0, 0, 0, 0, FALSE, FALSE} +}; + + CmdDef movement_cmds[] = { MOVEMENT_CMDS {NULL, 0, 0, 0, 0, FALSE, FALSE} @@ -567,7 +582,8 @@ static void perform_cmd(CmdDef *def, CmdContext *ctx) if (VI_IS_COMMAND(vi_get_mode())) { gboolean is_text_object_cmd = is_in_cmd_group(text_object_cmds, def); - if (is_text_object_cmd ||is_in_cmd_group(movement_cmds, def)) + gboolean is_include_dest_char_movement_cmd = is_in_cmd_group(include_dest_char_movement_cmds, def); + if (is_text_object_cmd || is_in_cmd_group(movement_cmds, def)) { def = get_cmd_to_run(top, operator_cmds, TRUE); if (def) @@ -585,6 +601,12 @@ static void perform_cmd(CmdDef *def, CmdContext *ctx) { sel_start = MIN(new_pos, orig_pos); sel_len = ABS(new_pos - orig_pos); + if (sel_len > 0 && is_include_dest_char_movement_cmd) + { + sel_len++; + if (new_pos < orig_pos) + sel_start--; + } } cmd_params_init(&param, ctx->sci, 1, FALSE, top, TRUE, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 4828bc: vimode: add a few extra excmd commands
by Jiří Techet 29 Sep '21

29 Sep '21

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 02 Sep 2021 15:23:17 UTC Commit: 4828bc329500a1f59fe669a8fe023a009d7e5a98 https://github.com/geany/geany-plugins/commit/4828bc329500a1f59fe669a8fe023… Log Message: ----------- vimode: add a few extra excmd commands This patch adds the following commands: :y[ank] :pu[t] :u[ndo] :red[o] :< :> :d[elete] :j[oin] Modified Paths: -------------- vimode/src/cmd-params.c vimode/src/cmds/excmds.c vimode/src/cmds/excmds.h vimode/src/excmd-runner.c Modified: vimode/src/cmd-params.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -26,7 +26,7 @@ void cmd_params_init(CmdParams *param, ScintillaObject *sci, param->num = num; param->num_present = num_present; - param->last_kp = g_slist_nth_data(kpl, 0); + param->last_kp = kpl != NULL ? g_slist_nth_data(kpl, 0) : NULL; param->is_operator_cmd = is_operator_cmd; param->sel_start = sel_start; Modified: vimode/src/cmds/excmds.c 69 lines changed, 69 insertions(+), 0 deletions(-) =================================================================== @@ -17,6 +17,7 @@ */ #include "cmds/excmds.h" +#include "cmds/edit.h" #include "utils.h" void excmd_save(CmdContext *c, ExCmdParams *p) @@ -64,3 +65,71 @@ void excmd_repeat_subst_orig_flags(CmdContext *c, ExCmdParams *p) { perform_substitute(c->sci, c->substitute_text, p->range_from, p->range_to, NULL); } + + +static void prepare_cmd_params(CmdParams *params, CmdContext *c, ExCmdParams *p) +{ + gint start = SSM(c->sci, SCI_POSITIONFROMLINE, p->range_from, 0); + SET_POS(c->sci, start, TRUE); + cmd_params_init(params, c->sci, p->range_to - p->range_from + 1, FALSE, NULL, FALSE, 0, 0); +} + + +void excmd_yank(CmdContext *c, ExCmdParams *p) +{ + CmdParams params; + prepare_cmd_params(&params, c, p); + cmd_copy_line(c, &params); +} + + +void excmd_put(CmdContext *c, ExCmdParams *p) +{ + CmdParams params; + prepare_cmd_params(&params, c, p); + cmd_paste_after(c, &params); +} + + +void excmd_undo(CmdContext *c, ExCmdParams *p) +{ + SSM(c->sci, SCI_UNDO, 0, 0); +} + + +void excmd_redo(CmdContext *c, ExCmdParams *p) +{ + SSM(c->sci, SCI_REDO, 0, 0); +} + + +void excmd_shift_left(CmdContext *c, ExCmdParams *p) +{ + CmdParams params; + prepare_cmd_params(&params, c, p); + cmd_unindent(c, &params); +} + + +void excmd_shift_right(CmdContext *c, ExCmdParams *p) +{ + CmdParams params; + prepare_cmd_params(&params, c, p); + cmd_indent(c, &params); +} + + +void excmd_delete(CmdContext *c, ExCmdParams *p) +{ + CmdParams params; + prepare_cmd_params(&params, c, p); + cmd_delete_line(c, &params); +} + +void excmd_join(CmdContext *c, ExCmdParams *p) +{ + CmdParams params; + prepare_cmd_params(&params, c, p); + cmd_join_lines(c, &params); +} + Modified: vimode/src/cmds/excmds.h 8 lines changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -29,5 +29,13 @@ void excmd_save_quit(CmdContext *c, ExCmdParams *p); void excmd_save_all_quit(CmdContext *c, ExCmdParams *p); void excmd_repeat_subst(CmdContext *c, ExCmdParams *p); void excmd_repeat_subst_orig_flags(CmdContext *c, ExCmdParams *p); +void excmd_yank(CmdContext *c, ExCmdParams *p); +void excmd_put(CmdContext *c, ExCmdParams *p); +void excmd_undo(CmdContext *c, ExCmdParams *p); +void excmd_redo(CmdContext *c, ExCmdParams *p); +void excmd_shift_left(CmdContext *c, ExCmdParams *p); +void excmd_shift_right(CmdContext *c, ExCmdParams *p); +void excmd_delete(CmdContext *c, ExCmdParams *p); +void excmd_join(CmdContext *c, ExCmdParams *p); #endif Modified: vimode/src/excmd-runner.c 22 lines changed, 21 insertions(+), 1 deletions(-) =================================================================== @@ -18,7 +18,7 @@ #include "excmd-runner.h" #include "excmd-params.h" -#include "excmds/excmds.h" +#include "cmds/excmds.h" #include "utils.h" #include <string.h> @@ -64,8 +64,28 @@ ExCmdDef ex_cmds[] = { {excmd_repeat_subst, "s"}, {excmd_repeat_subst, "substitute"}, {excmd_repeat_subst, "&"}, + {excmd_repeat_subst, "~"}, {excmd_repeat_subst_orig_flags, "&&"}, + {excmd_yank, "yank"}, + {excmd_yank, "y"}, + {excmd_put, "put"}, + {excmd_put, "pu"}, + + {excmd_undo, "undo"}, + {excmd_undo, "u"}, + {excmd_redo, "redo"}, + {excmd_redo, "red"}, + + {excmd_shift_left, "<"}, + {excmd_shift_right, ">"}, + + {excmd_delete, "delete"}, + {excmd_delete, "d"}, + + {excmd_join, "join"}, + {excmd_join, "j"}, + {NULL, NULL} }; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] f20a71: vimode: add :copy and :move ex commands
by Jiří Techet 29 Sep '21

29 Sep '21

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 02 Sep 2021 15:23:17 UTC Commit: f20a71d0d063f8c064acfc5ad5de7074e0271b39 https://github.com/geany/geany-plugins/commit/f20a71d0d063f8c064acfc5ad5de7… Log Message: ----------- vimode: add :copy and :move ex commands Modified Paths: -------------- vimode/src/cmds/excmds.c vimode/src/cmds/excmds.h vimode/src/excmd-params.h vimode/src/excmd-runner.c Modified: vimode/src/cmds/excmds.c 28 lines changed, 28 insertions(+), 0 deletions(-) =================================================================== @@ -133,3 +133,31 @@ void excmd_join(CmdContext *c, ExCmdParams *p) cmd_join_lines(c, &params); } + +void excmd_copy(CmdContext *c, ExCmdParams *p) +{ + CmdParams params; + gint dest = SSM(c->sci, SCI_POSITIONFROMLINE, p->dest, 0); + excmd_yank(c, p); + SET_POS(c->sci, dest, TRUE); + cmd_params_init(&params, c->sci, 1, FALSE, NULL, FALSE, 0, 0); + cmd_paste_after(c, &params); +} + + +void excmd_move(CmdContext *c, ExCmdParams *p) +{ + CmdParams params; + gint dest; + + if (p->dest >= p->range_from && p->dest <= p->range_to) + return; + + excmd_delete(c, p); + if (p->dest > p->range_to) + p->dest -= p->range_to - p->range_from + 1; + dest = SSM(c->sci, SCI_POSITIONFROMLINE, p->dest, 0); + SET_POS(c->sci, dest, TRUE); + cmd_params_init(&params, c->sci, 1, FALSE, NULL, FALSE, 0, 0); + cmd_paste_after(c, &params); +} Modified: vimode/src/cmds/excmds.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -37,5 +37,7 @@ void excmd_shift_left(CmdContext *c, ExCmdParams *p); void excmd_shift_right(CmdContext *c, ExCmdParams *p); void excmd_delete(CmdContext *c, ExCmdParams *p); void excmd_join(CmdContext *c, ExCmdParams *p); +void excmd_copy(CmdContext *c, ExCmdParams *p); +void excmd_move(CmdContext *c, ExCmdParams *p); #endif Modified: vimode/src/excmd-params.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -30,6 +30,8 @@ typedef struct /* ex range start and end */ gint range_from; gint range_to; + /* "address" destination for copy/move */ + gint dest; } ExCmdParams; typedef void (*ExCmd)(CmdContext *c, ExCmdParams *p); Modified: vimode/src/excmd-runner.c 11 lines changed, 11 insertions(+), 0 deletions(-) =================================================================== @@ -86,6 +86,13 @@ ExCmdDef ex_cmds[] = { {excmd_join, "join"}, {excmd_join, "j"}, + {excmd_copy, "copy"}, + {excmd_copy, "co"}, + {excmd_copy, "t"}, + + {excmd_move, "move"}, + {excmd_move, "m"}, + {NULL, NULL} }; @@ -433,7 +440,11 @@ static void perform_simple_ex_cmd(CmdContext *ctx, const gchar *cmd) ExCmdDef *def = &ex_cmds[i]; if (strcmp(def->name, cmd_name) == 0) { + if (def->cmd == excmd_copy || def->cmd == excmd_move) + parse_ex_range(&(params.param1), ctx, &(params.dest), &(params.dest)); + SSM(ctx->sci, SCI_BEGINUNDOACTION, 0, 0); def->cmd(ctx, &params); + SSM(ctx->sci, SCI_ENDUNDOACTION, 0, 0); break; } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits