From aeebed8d611b61ca8e4d469d0f3c0405a9d0f369 Mon Sep 17 00:00:00 2001
From: Shougo Matsushita <Shougo.Matsu@gmail.com>
Date: Sat, 1 Oct 2016 19:38:34 +0900
Subject: vim-patch:7.4.2158

Problem:    Result of getcompletion('', 'cscope') depends on previous
            completion. (Christian Brabandt)
Solution:   Call set_context_in_cscope_cmd().

https://github.com/vim/vim/commit/b650b9878e9f0ac6bb1b61230095ad9ab3850a33
---
 src/nvim/testdir/test_cmdline.vim | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'src/nvim/testdir')

diff --git a/src/nvim/testdir/test_cmdline.vim b/src/nvim/testdir/test_cmdline.vim
index 902ec1c05d..25a6e7200f 100644
--- a/src/nvim/testdir/test_cmdline.vim
+++ b/src/nvim/testdir/test_cmdline.vim
@@ -121,12 +121,22 @@ func Test_getcompletion()
   let l = getcompletion('dark', 'highlight')
   call assert_equal([], l)
 
+  if has('cscope')
+    let l = getcompletion('', 'cscope')
+    let cmds = ['add', 'find', 'help', 'kill', 'reset', 'show']
+    call assert_equal(cmds, l)
+    " using cmdline completion must not change the result
+    call feedkeys(":cscope find \<c-d>\<c-c>", 'xt')
+    let l = getcompletion('', 'cscope')
+    call assert_equal(cmds, l)
+    let keys = ['a', 'c', 'd', 'e', 'f', 'g', 'i', 's', 't']
+    let l = getcompletion('find ', 'cscope')
+    call assert_equal(keys, l)
+  endif
+
   " For others test if the name is recognized.
   let names = ['buffer', 'environment', 'file_in_path',
 	\ 'mapping', 'shellcmd', 'tag', 'tag_listfiles', 'user']
-  if has('cscope')
-    call add(names, 'cscope')
-  endif
   if has('cmdline_hist')
     call add(names, 'history')
   endif
-- 
cgit 


From de802fd4d22e813713bbd6825bfd75c5287a50b4 Mon Sep 17 00:00:00 2001
From: Shougo Matsushita <Shougo.Matsu@gmail.com>
Date: Sat, 1 Oct 2016 19:41:48 +0900
Subject: vim-patch:7.4.2162

Problem:    Result of getcompletion('', 'sign') depends on previous
            completion.
Solution:   Call set_context_in_sign_cmd(). (Dominique Pelle)

https://github.com/vim/vim/commit/7522f6982197f83a5c0f6e9af07fb713934f824a
---
 src/nvim/testdir/test_cmdline.vim | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'src/nvim/testdir')

diff --git a/src/nvim/testdir/test_cmdline.vim b/src/nvim/testdir/test_cmdline.vim
index 25a6e7200f..796fbdd45a 100644
--- a/src/nvim/testdir/test_cmdline.vim
+++ b/src/nvim/testdir/test_cmdline.vim
@@ -134,6 +134,19 @@ func Test_getcompletion()
     call assert_equal(keys, l)
   endif
 
+  if has('signs')
+    sign define Testing linehl=Comment
+    let l = getcompletion('', 'sign')
+    let cmds = ['define', 'jump', 'list', 'place', 'undefine', 'unplace']
+    call assert_equal(cmds, l)
+    " using cmdline completion must not change the result
+    call feedkeys(":sign list \<c-d>\<c-c>", 'xt')
+    let l = getcompletion('', 'sign')
+    call assert_equal(cmds, l)
+    let l = getcompletion('list ', 'sign')
+    call assert_equal(['Testing'], l)
+  endif
+
   " For others test if the name is recognized.
   let names = ['buffer', 'environment', 'file_in_path',
 	\ 'mapping', 'shellcmd', 'tag', 'tag_listfiles', 'user']
@@ -146,9 +159,6 @@ func Test_getcompletion()
   if has('profile')
     call add(names, 'syntime')
   endif
-  if has('signs')
-    call add(names, 'sign')
-  endif
 
   set tags=Xtags
   call writefile(["!_TAG_FILE_ENCODING\tutf-8\t//", "word\tfile\tcmd"], 'Xtags')
-- 
cgit 


From db324879d2956a2527851102183723df63039904 Mon Sep 17 00:00:00 2001
From: Shougo Matsushita <Shougo.Matsu@gmail.com>
Date: Sat, 1 Oct 2016 19:54:59 +0900
Subject: vim-patch:7.4.2205

Problem:    'wildignore' always applies to getcompletion().
Solution:   Add an option to use 'wildignore' or not. (Yegappan Lakshmanan)

https://github.com/vim/vim/commit/e9d58a6459687a1228b5aa85bd7b31f8f1e528a8
---
 src/nvim/testdir/test_cmdline.vim | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/nvim/testdir')

diff --git a/src/nvim/testdir/test_cmdline.vim b/src/nvim/testdir/test_cmdline.vim
index 796fbdd45a..bc5a5ca4ec 100644
--- a/src/nvim/testdir/test_cmdline.vim
+++ b/src/nvim/testdir/test_cmdline.vim
@@ -89,6 +89,10 @@ func Test_getcompletion()
   call assert_true(index(l, 'runtest.vim') >= 0)
   let l = getcompletion('walk', 'file')
   call assert_equal([], l)
+  set wildignore=*.vim
+  let l = getcompletion('run', 'file', 1)
+  call assert_true(index(l, 'runtest.vim') < 0)
+  set wildignore&
 
   let l = getcompletion('ha', 'filetype')
   call assert_true(index(l, 'hamster') >= 0)
-- 
cgit