Mercurial > vim
changeset 28215:cb462f4c6b12 v8.2.4633
patch 8.2.4633: Visual range does not work before command modifiers
Commit: https://github.com/vim/vim/commit/c75bca3ee955ff36ece99a42041733ddea5f45a7
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Mar 27 13:36:50 2022 +0100
patch 8.2.4633: Visual range does not work before command modifiers
Problem: Visual range does not work before command modifiers.
Solution: Move Visual range to after command modifiers.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 27 Mar 2022 14:45:07 +0200 |
parents | 77216ce30cef |
children | b6a02697f304 |
files | src/ex_docmd.c src/testdir/test_source.vim src/version.c |
diffstat | 3 files changed, 35 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -2782,13 +2782,25 @@ parse_command_modifiers( cmdmod_T *cmod, int skip_only) { + char_u *cmd_start; char_u *p; int starts_with_colon = FALSE; int vim9script = in_vim9script(); + int has_visual_range = FALSE; CLEAR_POINTER(cmod); cmod->cmod_flags = sticky_cmdmod_flags; + if (STRNCMP(eap->cmd, "'<,'>", 5) == 0) + { + // The automatically inserted Visual area range is skipped, so that + // typing ":cmdmod cmd" in Visual mode works without having to move the + // range to after the modififiers. + eap->cmd += 5; + cmd_start = eap->cmd; + has_visual_range = TRUE; + } + // Repeat until no more command modifiers are found. for (;;) { @@ -2849,12 +2861,11 @@ parse_command_modifiers( { char_u *s, *n; - for (s = p; ASCII_ISALPHA(*s); ++s) + for (s = eap->cmd; ASCII_ISALPHA(*s); ++s) ; n = skipwhite(s); - if (vim_strchr((char_u *)".=", *n) != NULL - || *s == '[' - || (*n != NUL && n[1] == '=')) + if (*n == '.' || *n == '=' || (*n != NUL && n[1] == '=') + || *s == '[') break; } @@ -3081,6 +3092,17 @@ parse_command_modifiers( break; } + if (has_visual_range && eap->cmd > cmd_start) + { + // Move the '<,'> range to after the modifiers and insert a colon. + // Since the modifiers have been parsed put the colon on top of the + // space: "'<,'>mod cmd" -> "mod:'<,'>cmd + // Put eap->cmd after the colon. + mch_memmove(cmd_start - 5, cmd_start, eap->cmd - cmd_start); + eap->cmd -= 5; + mch_memmove(eap->cmd - 1, ":'<,'>", 6); + } + return OK; }
--- a/src/testdir/test_source.vim +++ b/src/testdir/test_source.vim @@ -579,6 +579,13 @@ func Test_source_buffer_vim9() call assert_equal(#{pi: 3.12, e: 2.71828}, g:Math) call assert_equal(['vim', 'nano'], g:Editors) + " '<,'> range before the cmd modifier works + unlet g:Math + unlet g:Editors + exe "normal 6GV4j:vim9cmd source\<CR>" + call assert_equal(['vim', 'nano'], g:Editors) + unlet g:Editors + " test for using try/catch %d _ let lines =<< trim END