4 files changed, 16 insertions, 2 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 82a6c12551..7689ea1a27 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -9648,13 +9648,23 @@ static void f_getcompletion(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u        *pat;
   expand_T      xpc;
+  bool          filtered = false;
   int           options = WILD_SILENT | WILD_USE_NL | WILD_ADD_SLASH
           | WILD_NO_BEEP;
 
+  if (argvars[2].v_type != VAR_UNKNOWN) {
+    filtered = get_tv_number_chk(&argvars[2], NULL);
+  }
+
   if (p_wic) {
     options |= WILD_ICASE;
   }
 
+  // For filtered results, 'wildignore' is used
+  if (!filtered) {
+    options |= WILD_KEEP_ALL;
+  }
+
   ExpandInit(&xpc);
   xpc.xp_pattern = get_tv_string(&argvars[0]);
   xpc.xp_pattern_len = STRLEN(xpc.xp_pattern);
diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua
index 3c371fc264..984ccebbf8 100644
--- a/src/nvim/eval.lua
+++ b/src/nvim/eval.lua
@@ -114,7 +114,7 @@ return {
     getcmdpos={},
     getcmdtype={},
     getcmdwintype={},
-    getcompletion={args=2},
+    getcompletion={args={2, 3}},
     getcurpos={},
     getcwd={args={0,2}},
     getfontname={args={0, 1}},
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)
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 508d1e8921..6dc248269a 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -236,7 +236,7 @@ static int included_patches[] = {
   // 2208,
   // 2207 NA
   // 2206 NA
-  // 2205,
+  2205,
   // 2204,
   // 2203 NA
   // 2202 NA