Merge remote-tracking branch 'vim/master'

Author: splhack

src/channel.c

@@ -811,6 +811,7 @@ channel_get_json(int ch_idx, int id, typval_T **rettv)
 
 	if ((id > 0 && tv->v_type == VAR_NUMBER && tv->vval.v_number == id)
 	      || (id <= 0 && (tv->v_type != VAR_NUMBER
+			       || tv->vval.v_number == 0
 			       || tv->vval.v_number != channel->ch_block_id)))
 	{
 	    *rettv = item->value;

src/eval.c

@@ -532,6 +532,7 @@ static void f_delete(typval_T *argvars, typval_T *rettv);
 static void f_did_filetype(typval_T *argvars, typval_T *rettv);
 static void f_diff_filler(typval_T *argvars, typval_T *rettv);
 static void f_diff_hlID(typval_T *argvars, typval_T *rettv);
+static void f_disable_char_avail_for_testing(typval_T *argvars, typval_T *rettv);
 static void f_empty(typval_T *argvars, typval_T *rettv);
 static void f_escape(typval_T *argvars, typval_T *rettv);
 static void f_eval(typval_T *argvars, typval_T *rettv);
@@ -8111,6 +8112,7 @@ static struct fst
     {"did_filetype",	0, 0, f_did_filetype},
     {"diff_filler",	1, 1, f_diff_filler},
     {"diff_hlID",	2, 2, f_diff_hlID},
+    {"disable_char_avail_for_testing", 1, 1, f_disable_char_avail_for_testing},
     {"empty",		1, 1, f_empty},
     {"escape",		2, 2, f_escape},
     {"eval",		1, 1, f_eval},
@@ -10605,6 +10607,15 @@ f_diff_hlID(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
 #endif
 }
 
+/*
+ * "disable_char_avail_for_testing({expr})" function
+ */
+    static void
+f_disable_char_avail_for_testing(typval_T *argvars, typval_T *rettv UNUSED)
+{
+    disable_char_avail_for_testing = get_tv_number(&argvars[0]);
+}
+
 /*
  * "empty({expr})" function
  */
@@ -12456,8 +12467,11 @@ getpos_both(
 #endif
 							      (varnumber_T)0);
 	if (getcurpos)
+	{
+	    update_curswant();
 	    list_append_number(l, curwin->w_curswant == MAXCOL ?
 		    (varnumber_T)MAXCOL : (varnumber_T)curwin->w_curswant + 1);
+	}
     }
     else
 	rettv->vval.v_number = FALSE;

src/getchar.c

@@ -1888,6 +1888,12 @@ char_avail(void)
 {
     int	    retval;
 
+#ifdef FEAT_EVAL
+    /* When disable_char_avail_for_testing(1) was called pretend there is no
+     * typeahead. */
+    if (disable_char_avail_for_testing)
+	return FALSE;
+#endif
     ++no_mapping;
     retval = vpeekc();
     --no_mapping;

src/globals.h

@@ -1625,6 +1625,8 @@ EXTERN alloc_id_T  alloc_fail_id INIT(= aid_none);
 EXTERN int  alloc_fail_countdown INIT(= -1);
 /* set by alloc_fail(), number of times alloc() returns NULL */
 EXTERN int  alloc_fail_repeat INIT(= 0);
+
+EXTERN int  disable_char_avail_for_testing INIT(= 0);
 #endif
 
 /*

src/testdir/README.txt

@@ -25,6 +25,9 @@ What you can use (see test_assert.vim for an example):
   to check memory allocation failures are handled gracefully.  You need to
   change the source code to add an ID to the allocation.  Update LAST_ID_USED
   above alloc_id() to the highest ID used.
+- Use disable_char_avail_for_testing(1) if char_avail() must return FALSE for
+  a while.  E.g. to trigger the CursorMovedI autocommand event.
+  See test_cursor_func.vim for an example
 
 
 TO ADD AN OLD STYLE TEST:

src/testdir/test_channel.py

@@ -130,6 +130,16 @@ def handle(self):
                     elif decoded[1] == 'eval-result':
                         # Send back the last received eval result.
                         response = last_eval
+                    elif decoded[1] == 'call me':
+                        cmd = '[0,"we called you"]'
+                        print("sending: {}".format(cmd))
+                        self.request.sendall(cmd.encode('utf-8'))
+                        response = "ok"
+                    elif decoded[1] == 'call me again':
+                        cmd = '[0,"we did call you"]'
+                        print("sending: {}".format(cmd))
+                        self.request.sendall(cmd.encode('utf-8'))
+                        response = ""
                     elif decoded[1] == '!quit!':
                         # we're done
                         self.server.shutdown()
@@ -140,9 +150,12 @@ def handle(self):
                     else:
                         response = "what?"
 
-                    encoded = json.dumps([decoded[0], response])
-                    print("sending: {}".format(encoded))
-                    self.request.sendall(encoded.encode('utf-8'))
+                    if response == "":
+                        print("no response")
+                    else:
+                        encoded = json.dumps([decoded[0], response])
+                        print("sending: {}".format(encoded))
+                        self.request.sendall(encoded.encode('utf-8'))
 
                 # Negative numbers are used for "eval" responses.
                 elif decoded[0] < 0:

src/testdir/test_channel.vim

@@ -19,55 +19,63 @@ elseif has('win32')
     finish
   endif
 else
+  " Can't run this test.
   finish
 endif
 
-let s:port = -1
 let s:chopt = has('macunix') ? {'waittime' : 1} : {}
 
-func s:start_server()
+" Run "testfunc" after sarting the server and stop the server afterwards.
+func s:run_server(testfunc)
   " The Python program writes the port number in Xportnr.
   call delete("Xportnr")
 
-  if has('job')
-    let s:job = job_start("python test_channel.py")
-  elseif has('win32')
-    silent !start cmd /c start "test_channel" py test_channel.py
-  else
-    silent !python test_channel.py&
-  endif
+  try
+    if has('job')
+      let s:job = job_start("python test_channel.py")
+    elseif has('win32')
+      silent !start cmd /c start "test_channel" py test_channel.py
+    else
+      silent !python test_channel.py&
+    endif
 
-  " Wait for up to 2 seconds for the port number to be there.
-  let cnt = 20
-  let l = []
-  while cnt > 0
-    try
-      let l = readfile("Xportnr")
-    catch
-    endtry
-    if len(l) >= 1
-      break
+    " Wait for up to 2 seconds for the port number to be there.
+    let cnt = 20
+    let l = []
+    while cnt > 0
+      try
+        let l = readfile("Xportnr")
+      catch
+      endtry
+      if len(l) >= 1
+        break
+      endif
+      sleep 100m
+      let cnt -= 1
+    endwhile
+    call delete("Xportnr")
+
+    if len(l) == 0
+      " Can't make the connection, give up.
+      call assert_false(1, "Can't start test_channel.py")
+      return -1
     endif
-    sleep 100m
-    let cnt -= 1
-  endwhile
-  call delete("Xportnr")
+    let port = l[0]
 
-  if len(l) == 0
-    " Can't make the connection, give up.
+    call call(function(a:testfunc), [port])
+  catch
+    call assert_false(1, "Caught exception: " . v:exception)
+  finally
     call s:kill_server()
-    call assert_false(1, "Can't start test_channel.py")
-    return -1
-  endif
-  let s:port = l[0]
-
-  let handle = ch_open('localhost:' . s:port, s:chopt)
-  return handle
+  endtry
 endfunc
 
 func s:kill_server()
   if has('job')
-    call job_stop(s:job)
+    if exists('s:job')
+      call job_stop(s:job)
+      unlet s:job
+    endif
   elseif has('win32')
     call system('taskkill /IM py.exe /T /F /FI "WINDOWTITLE eq test_channel"')
   else
@@ -82,9 +90,10 @@ func s:RequestHandler(handle, msg)
   let s:responseMsg = a:msg
 endfunc
 
-func Test_communicate()
-  let handle = s:start_server()
+func s:communicate(port)
+  let handle = ch_open('localhost:' . a:port, s:chopt)
   if handle < 0
+    call assert_false(1, "Can't open channel")
     return
   endif
 
@@ -144,39 +153,84 @@ func Test_communicate()
 
   " make the server quit, can't check if this works, should not hang.
   call ch_sendexpr(handle, '!quit!', 0)
+endfunc
 
-  call s:kill_server()
+func Test_communicate()
+  call s:run_server('s:communicate')
 endfunc
 
 " Test that we can open two channels.
-func Test_two_channels()
-  let handle = s:start_server()
+func s:two_channels(port)
+  let handle = ch_open('localhost:' . a:port, s:chopt)
   if handle < 0
+    call assert_false(1, "Can't open channel")
     return
   endif
+
   call assert_equal('got it', ch_sendexpr(handle, 'hello!'))
 
-  let newhandle = ch_open('localhost:' . s:port, s:chopt)
+  let newhandle = ch_open('localhost:' . a:port, s:chopt)
+  if newhandle < 0
+    call assert_false(1, "Can't open second channel")
+    return
+  endif
   call assert_equal('got it', ch_sendexpr(newhandle, 'hello!'))
   call assert_equal('got it', ch_sendexpr(handle, 'hello!'))
 
   call ch_close(handle)
   call assert_equal('got it', ch_sendexpr(newhandle, 'hello!'))
 
-  call s:kill_server()
+  call ch_close(newhandle)
+endfunc
+
+func Test_two_channels()
+  call s:run_server('s:two_channels')
 endfunc
 
 " Test that a server crash is handled gracefully.
-func Test_server_crash()
-  let handle = s:start_server()
+func s:server_crash(port)
+  let handle = ch_open('localhost:' . a:port, s:chopt)
   if handle < 0
+    call assert_false(1, "Can't open channel")
     return
   endif
+
   call ch_sendexpr(handle, '!crash!')
 
-  " kill the server in case if failed to crash
   sleep 10m
-  call s:kill_server()
+endfunc
+
+func Test_server_crash()
+  call s:run_server('s:server_crash')
+endfunc
+
+let s:reply = ""
+func s:Handler(chan, msg)
+  let s:reply = a:msg
+endfunc
+
+func s:channel_handler(port)
+  let chopt = copy(s:chopt)
+  let chopt['callback'] = 's:Handler'
+  let handle = ch_open('localhost:' . a:port, chopt)
+  if handle < 0
+    call assert_false(1, "Can't open channel")
+    return
+  endif
+
+  " Test that it works while waiting on a numbered message.
+  call assert_equal('ok', ch_sendexpr(handle, 'call me'))
+  sleep 10m
+  call assert_equal('we called you', s:reply)
+
+  " Test that it works while not waiting on a numbered message.
+  call ch_sendexpr(handle, 'call me again', 0)
+  sleep 10m
+  call assert_equal('we did call you', s:reply)
+endfunc
+
+func Test_channel_handler()
+  call s:run_server('s:channel_handler')
 endfunc
 
 " Test that trying to connect to a non-existing port fails quickly.
@@ -198,6 +252,7 @@ func Test_connect_waittime()
     call ch_close(handle)
   else
     " Failed connection doesn't wait the full time on Unix.
+    " TODO: why is MS-Windows different?
     let elapsed = reltime(start)
     call assert_true(reltimefloat(elapsed) < (has('unix') ? 1.0 : 3.0))
   endif

src/testdir/test_cursor_func.vim

@@ -20,16 +20,35 @@ func Test_move_cursor()
   call assert_equal([4, 3, 0, 3], getcurpos()[1:])
 
   call cursor(2, 2)
-  call assert_equal([2, 2, 0, 3], getcurpos()[1:])
+  call assert_equal([2, 2, 0, 2], getcurpos()[1:])
   " line number zero keeps the line number
   call cursor(0, 1)
-  call assert_equal([2, 1, 0, 3], getcurpos()[1:])
+  call assert_equal([2, 1, 0, 1], getcurpos()[1:])
   " col number zero keeps the column
   call cursor(3, 0)
-  call assert_equal([3, 1, 0, 3], getcurpos()[1:])
+  call assert_equal([3, 1, 0, 1], getcurpos()[1:])
   " below last line goes to last line
   call cursor(9, 1)
-  call assert_equal([4, 1, 0, 3], getcurpos()[1:])
+  call assert_equal([4, 1, 0, 1], getcurpos()[1:])
 
   quit!
 endfunc
+
+" Very short version of what matchparen does.
+function s:Highlight_Matching_Pair()
+  let save_cursor = getcurpos()
+  call setpos('.', save_cursor)
+endfunc
+
+func Test_curswant_with_autocommand()
+  new
+  call setline(1, ['func()', '{', '}', '----'])
+  autocmd! CursorMovedI * call s:Highlight_Matching_Pair()
+  call disable_char_avail_for_testing(1)
+  exe "normal! 3Ga\<Down>X\<Esc>"
+  call disable_char_avail_for_testing(0)
+  call assert_equal('-X---', getline(4))
+  autocmd! CursorMovedI *
+  quit!
+endfunc
+

src/version.c

@@ -762,6 +762,14 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1301,
+/**/
+    1300,
+/**/
+    1299,
+/**/
+    1298,
 /**/
     1297,
 /**/