IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.3466: completion submode not indicated for virtual replace (#15886)

Browse Source 
Problem:    Completion submode not indicated for virtual replace.
Solution:   Add submode to "Rv". (closes vim/vim#8945)
cc8cd44533
This commit is contained in:
zeertzjq 2021-10-04 03:04:51 +08:00 committed by GitHub
parent 04b59ebd85
commit 7ba11e06c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 51 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
runtime/doc/eval.txt
View File

@ -6865,29 +6865,31 @@ mode([expr]) Return a string that indicates the current mode.
niR Normal using |i_CTRL-O| in |Replace-mode| niR Normal using |i_CTRL-O| in |Replace-mode|
niV Normal using |i_CTRL-O| in |Virtual-Replace-mode| niV Normal using |i_CTRL-O| in |Virtual-Replace-mode|
v Visual by character v Visual by character
vs Visual by character using |v_CTRL-O| in Select mode
V Visual by line V Visual by line
Vs Visual by line using |v_CTRL-O| in Select mode
CTRL-V Visual blockwise CTRL-V Visual blockwise
CTRL-Vs Visual blockwise using |v_CTRL-O| in Select mode
s Select by character s Select by character
S Select by line S Select by line
CTRL-S Select blockwise CTRL-S Select blockwise
vs Visual by character using |v_CTRL-O| from
Select mode
Vs Visual by line using |v_CTRL-O| from Select mode
CTRL-Vs Visual blockwise using |v_CTRL-O| from Select mode
i Insert i Insert
ic Insert mode completion |compl-generic| ic Insert mode completion |compl-generic|
ix Insert mode |i_CTRL-X| completion ix Insert mode |i_CTRL-X| completion
R Replace |R| R Replace |R|
Rc Replace mode completion |compl-generic| Rc Replace mode completion |compl-generic|
Rv Virtual Replace |gR|
Rx Replace mode |i_CTRL-X| completion Rx Replace mode |i_CTRL-X| completion
Rv Virtual Replace |gR|
Rvc Virtual Replace mode completion |compl-generic|
Rvx Virtual Replace mode |i_CTRL-X| completion
c Command-line editing c Command-line editing
cv Vim Ex mode |Q| or |gQ| cv Vim Ex mode |Q| or |gQ|
r Hit-enter prompt r Hit-enter prompt
rm The -- more -- prompt rm The -- more -- prompt
r? |:confirm| query of some sort r? A |:confirm| query of some sort
! Shell or external command is executing ! Shell or external command is executing
t Terminal mode: keys go to the job t Terminal mode: keys go to the job
This is useful in the 'statusline' option or when used This is useful in the 'statusline' option or when used
with |remote_expr()| In most other places it always returns with |remote_expr()| In most other places it always returns
"c" or "n". "c" or "n".

5
src/nvim/state.c
View File

@ -161,6 +161,11 @@ char *get_mode(void)
if (State & VREPLACE_FLAG) { if (State & VREPLACE_FLAG) {
buf[0] = 'R'; buf[0] = 'R';
buf[1] = 'v'; buf[1] = 'v';
if (ins_compl_active()) {
buf[2] = 'c';
} else if (ctrl_x_mode_not_defined_yet()) {
buf[2] = 'x';
}
} else { } else {
if (State & REPLACE_FLAG) { if (State & REPLACE_FLAG) {
buf[0] = 'R'; buf[0] = 'R';

38
src/nvim/testdir/test_functions.vim
View File

@ -585,6 +585,8 @@ func Test_mode()
exe "normal iabc\<C-X>\<C-L>\<F2>\<Esc>u" exe "normal iabc\<C-X>\<C-L>\<F2>\<Esc>u"
call assert_equal('i-ic', g:current_modes) call assert_equal('i-ic', g:current_modes)
exe "normal R\<F2>\<Esc>"
call assert_equal('R-R', g:current_modes)
" R_CTRL-P: Multiple matches " R_CTRL-P: Multiple matches
exe "normal RBa\<C-P>\<F2>\<Esc>u" exe "normal RBa\<C-P>\<F2>\<Esc>u"
call assert_equal('R-Rc', g:current_modes) call assert_equal('R-Rc', g:current_modes)
@ -619,6 +621,42 @@ func Test_mode()
exe "normal Rabc\<C-X>\<C-L>\<F2>\<Esc>u" exe "normal Rabc\<C-X>\<C-L>\<F2>\<Esc>u"
call assert_equal('R-Rc', g:current_modes) call assert_equal('R-Rc', g:current_modes)
exe "normal gR\<F2>\<Esc>"
call assert_equal('R-Rv', g:current_modes)
" gR_CTRL-P: Multiple matches
exe "normal gRBa\<C-P>\<F2>\<Esc>u"
call assert_equal('R-Rvc', g:current_modes)
" gR_CTRL-P: Single match
exe "normal gRBro\<C-P>\<F2>\<Esc>u"
call assert_equal('R-Rvc', g:current_modes)
" gR_CTRL-X
exe "normal gRBa\<C-X>\<F2>\<Esc>u"
call assert_equal('R-Rvx', g:current_modes)
" gR_CTRL-X CTRL-P: Multiple matches
exe "normal gRBa\<C-X>\<C-P>\<F2>\<Esc>u"
call assert_equal('R-Rvc', g:current_modes)
" gR_CTRL-X CTRL-P: Single match
exe "normal gRBro\<C-X>\<C-P>\<F2>\<Esc>u"
call assert_equal('R-Rvc', g:current_modes)
" gR_CTRL-X CTRL-P + CTRL-P: Single match
exe "normal gRBro\<C-X>\<C-P>\<C-P>\<F2>\<Esc>u"
call assert_equal('R-Rvc', g:current_modes)
" gR_CTRL-X CTRL-L: Multiple matches
exe "normal gR\<C-X>\<C-L>\<F2>\<Esc>u"
call assert_equal('R-Rvc', g:current_modes)
" gR_CTRL-X CTRL-L: Single match
exe "normal gRBlu\<C-X>\<C-L>\<F2>\<Esc>u"
call assert_equal('R-Rvc', g:current_modes)
" gR_CTRL-P: No match
exe "normal gRCom\<C-P>\<F2>\<Esc>u"
call assert_equal('R-Rvc', g:current_modes)
" gR_CTRL-X CTRL-P: No match
exe "normal gRCom\<C-X>\<C-P>\<F2>\<Esc>u"
call assert_equal('R-Rvc', g:current_modes)
" gR_CTRL-X CTRL-L: No match
exe "normal gRabc\<C-X>\<C-L>\<F2>\<Esc>u"
call assert_equal('R-Rvc', g:current_modes)
call assert_equal('n', mode(0)) call assert_equal('n', mode(0))
call assert_equal('n', mode(1)) call assert_equal('n', mode(1))