From a2bf0cef10926880b28d542887d2d3836e332929 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 16 Dec 2022 06:08:59 +0800
Subject: vim-patch:9.0.1062: some test function names do not match what they
 are doing (#21429)

Problem:    Some test function names do not match what they are doing.
Solution:   Leave out user data for the test that is called "NoUserData".
            (closes vim/vim#11703)

https://github.com/vim/vim/commit/4cd45f1408321905019614b40a2173fe0456a96d

Nvim's tests already match function names. Add missing indent changes
and a missing comment from patch 8.2.0084.
---
 src/nvim/insexpand.c                   |  1 +
 src/nvim/testdir/test_ins_complete.vim | 42 +++++++++++++++++-----------------
 2 files changed, 22 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/nvim/insexpand.c b/src/nvim/insexpand.c
index 6531da6419..0db05d482b 100644
--- a/src/nvim/insexpand.c
+++ b/src/nvim/insexpand.c
@@ -2755,6 +2755,7 @@ static void get_complete_info(list_T *what_list, dict_T *retdict)
           tv_dict_add_str(di, S_LEN("kind"), EMPTY_IF_NULL(match->cp_text[CPT_KIND]));
           tv_dict_add_str(di, S_LEN("info"), EMPTY_IF_NULL(match->cp_text[CPT_INFO]));
           if (match->cp_user_data.v_type == VAR_UNKNOWN) {
+            // Add an empty string for backwards compatibility
             tv_dict_add_str(di, S_LEN("user_data"), "");
           } else {
             tv_dict_add_tv(di, S_LEN("user_data"), &match->cp_user_data);
diff --git a/src/nvim/testdir/test_ins_complete.vim b/src/nvim/testdir/test_ins_complete.vim
index c1c78e9a8f..7a9392545e 100644
--- a/src/nvim/testdir/test_ins_complete.vim
+++ b/src/nvim/testdir/test_ins_complete.vim
@@ -191,17 +191,17 @@ func s:CompleteDone_CompleteFuncDict( findstart, base )
   endif
 
   return {
-          \ 'words': [
-            \ {
-              \ 'word': 'aword',
-              \ 'abbr': 'wrd',
-              \ 'menu': 'extra text',
-              \ 'info': 'words are cool',
-              \ 'kind': 'W',
-              \ 'user_data': ['one', 'two']
-            \ }
-          \ ]
-        \ }
+	  \ 'words': [
+	    \ {
+	      \ 'word': 'aword',
+	      \ 'abbr': 'wrd',
+	      \ 'menu': 'extra text',
+	      \ 'info': 'words are cool',
+	      \ 'kind': 'W',
+	      \ 'user_data': ['one', 'two']
+	    \ }
+	  \ ]
+	\ }
 endfunc
 
 func s:CompleteDone_CheckCompletedItemNone()
@@ -261,16 +261,16 @@ func s:CompleteDone_CompleteFuncDictNoUserData(findstart, base)
   endif
 
   return {
-          \ 'words': [
-            \ {
-              \ 'word': 'aword',
-              \ 'abbr': 'wrd',
-              \ 'menu': 'extra text',
-              \ 'info': 'words are cool',
-              \ 'kind': 'W'
-            \ }
-          \ ]
-        \ }
+	  \ 'words': [
+	    \ {
+	      \ 'word': 'aword',
+	      \ 'abbr': 'wrd',
+	      \ 'menu': 'extra text',
+	      \ 'info': 'words are cool',
+	      \ 'kind': 'W',
+	    \ }
+	  \ ]
+	\ }
 endfunc
 
 func s:CompleteDone_CheckCompletedItemDictNoUserData()
-- 
cgit