neovim

commit 2c522854c78d4e02d7337cf0b06174387f7f4583
parent 63244f68e70f233b4175ce0018a58932f075d4c5
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Sun, 31 Jul 2022 18:49:57 +0800

vim-patch:9.0.0118: no test for what patch 9.0.0155 fixes

Problem:    No test for what patch 9.0.0155 fixes.
Solution:   Add a test. Fix typos.  (closes vim/vim#10822)
https://github.com/vim/vim/commit/750209459c9e54030409afe8f4ad59570600b5c4

Diffstat:
M
src/nvim/globals.h
 | 
4
++--
M
src/nvim/ops.c
 | 
2
+-
M
src/nvim/testdir/test_ins_complete.vim
 | 
2
+-
M
src/nvim/testdir/test_messages.vim
 | 
17
+++++++++++++----

4 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
@@ -1084,7 +1084,7 @@ EXTERN char windowsVersion[20] INIT(= { 0 });
 
 EXTERN int exit_need_delay INIT(= 0);
 
-// Set when 'cmdheight' is changed from non-zero to one temporarily.
-EXTERN int made_cmdheight_nonzero INIT(= false);
+// Set when 'cmdheight' is changed from zero to one temporarily.
+EXTERN bool made_cmdheight_nonzero INIT(= false);
 
 #endif  // NVIM_GLOBALS_H
diff --git a/src/nvim/ops.c b/src/nvim/ops.c
@@ -909,7 +909,7 @@ int do_record(int c)
       retval = OK;
 
       if (!ui_has_messages()) {
-        // Enable macro indicator temporary
+        // Enable macro indicator temporarily
         set_option_value("ch", 1L, NULL, 0);
         update_screen(VALID);
 
diff --git a/src/nvim/testdir/test_ins_complete.vim b/src/nvim/testdir/test_ins_complete.vim
@@ -346,7 +346,7 @@ func Test_CompleteDone_modify()
         \ 'user_data': '',
         \ }
   let v:completed_item = value
-  call assert_equal(v:completed_item, value)
+  call assert_equal(value, v:completed_item)
 endfunc
 
 func CompleteTest(findstart, query)
diff --git a/src/nvim/testdir/test_messages.vim b/src/nvim/testdir/test_messages.vim
@@ -338,14 +338,14 @@ func Test_cmdheight_zero()
 
   " Check change/restore cmdheight when macro
   call feedkeys("qa", "xt")
-  call assert_equal(&cmdheight, 1)
+  call assert_equal(1, &cmdheight)
   call feedkeys("q", "xt")
-  call assert_equal(&cmdheight, 0)
+  call assert_equal(0, &cmdheight)
 
   call setline(1, 'somestring')
   call feedkeys("y", "n")
   %s/somestring/otherstring/gc
-  call assert_equal(getline(1), 'otherstring')
+  call assert_equal('otherstring', getline(1))
 
   call feedkeys("g\<C-g>", "xt")
   call assert_match(
@@ -357,7 +357,16 @@ func Test_cmdheight_zero()
     split
   endfor
   only
-  call assert_equal(&cmdheight, 0)
+  call assert_equal(0, &cmdheight)
+
+  " Check that pressing ":" should not scroll a window
+  " Check for what patch 9.0.0115 fixes
+  botright 10new
+  call setline(1, range(12))
+  7
+  call feedkeys(":\"\<C-R>=line('w0')\<CR>\<CR>", "xt")
+  call assert_equal('"1', @:)
+  bwipe!
 
   set cmdheight&
   set showcmd&