aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/functional/plugin/lsp/completion_spec.lua10
-rw-r--r--test/functional/ui/popupmenu_spec.lua28
-rw-r--r--test/old/testdir/test_popup.vim8
3 files changed, 23 insertions, 23 deletions
diff --git a/test/functional/plugin/lsp/completion_spec.lua b/test/functional/plugin/lsp/completion_spec.lua
index 4df8d77d44..cb49526f56 100644
--- a/test/functional/plugin/lsp/completion_spec.lua
+++ b/test/functional/plugin/lsp/completion_spec.lua
@@ -320,7 +320,7 @@ describe('vim.lsp.completion: item conversion', function()
info = '',
kind = 'Module',
menu = '',
- hl_group = '',
+ abbr_hlgroup = '',
word = 'this_thread',
}
local result = complete(' std::this|', completion_list)
@@ -376,7 +376,7 @@ describe('vim.lsp.completion: item conversion', function()
info = '',
kind = 'Module',
menu = '',
- hl_group = '',
+ abbr_hlgroup = '',
word = 'this_thread',
}
local result = complete(' std::this|is', completion_list)
@@ -570,7 +570,7 @@ describe('vim.lsp.completion: protocol', function()
info = '',
kind = 'Unknown',
menu = '',
- hl_group = '',
+ abbr_hlgroup = '',
user_data = {
nvim = {
lsp = {
@@ -591,7 +591,7 @@ describe('vim.lsp.completion: protocol', function()
info = '',
kind = 'Unknown',
menu = '',
- hl_group = 'DiagnosticDeprecated',
+ abbr_hlgroup = 'DiagnosticDeprecated',
user_data = {
nvim = {
lsp = {
@@ -613,7 +613,7 @@ describe('vim.lsp.completion: protocol', function()
info = '',
kind = 'Unknown',
menu = '',
- hl_group = 'DiagnosticDeprecated',
+ abbr_hlgroup = 'DiagnosticDeprecated',
user_data = {
nvim = {
lsp = {
diff --git a/test/functional/ui/popupmenu_spec.lua b/test/functional/ui/popupmenu_spec.lua
index f84362ede8..79788cf295 100644
--- a/test/functional/ui/popupmenu_spec.lua
+++ b/test/functional/ui/popupmenu_spec.lua
@@ -4963,8 +4963,8 @@ describe('builtin popupmenu', function()
feed('<C-E><Esc>')
end)
- -- oldtest: Test_pum_user_hl_group()
- it('custom hl_group override', function()
+ -- oldtest: Test_pum_user_abbr_hlgroup()
+ it('custom abbr_hlgroup override', function()
exec([[
func CompleteFunc( findstart, base )
if a:findstart
@@ -4972,9 +4972,9 @@ describe('builtin popupmenu', function()
endif
return {
\ 'words': [
- \ { 'word': 'aword1', 'menu': 'extra text 1', 'kind': 'W', 'hl_group': 'StrikeFake' },
+ \ { 'word': 'aword1', 'menu': 'extra text 1', 'kind': 'W', 'abbr_hlgroup': 'StrikeFake' },
\ { 'word': 'aword2', 'menu': 'extra text 2', 'kind': 'W', },
- \ { 'word': '你好', 'menu': 'extra text 3', 'kind': 'W', 'hl_group': 'StrikeFake' },
+ \ { 'word': '你好', 'menu': 'extra text 3', 'kind': 'W', 'abbr_hlgroup': 'StrikeFake' },
\]}
endfunc
set completeopt=menu
@@ -4990,9 +4990,9 @@ describe('builtin popupmenu', function()
feed('Saw<C-X><C-U>')
screen:expect([[
aword1^ |
- {ds:aword1 W extra text 1 }{1: }|
+ {ds:aword1}{s: W extra text 1 }{1: }|
{n:aword2 W extra text 2 }{1: }|
- {dn:你好 W extra text 3 }{1: }|
+ {dn:你好}{n: W extra text 3 }{1: }|
{1:~ }|*15
{2:-- }{5:match 1 of 3} |
]])
@@ -5003,18 +5003,18 @@ describe('builtin popupmenu', function()
feed('Saw<C-X><C-U>')
screen:expect([[
aword1^ |
- {uds:aw}{ds:ord1 W extra text 1 }{1: }|
+ {uds:aw}{ds:ord1}{s: W extra text 1 }{1: }|
{umn:aw}{n:ord2 W extra text 2 }{1: }|
- {dn:你好 W extra text 3 }{1: }|
+ {dn:你好}{n: W extra text 3 }{1: }|
{1:~ }|*15
{2:-- }{5:match 1 of 3} |
]])
feed('<C-N>')
screen:expect([[
aword2^ |
- {udn:aw}{dn:ord1 W extra text 1 }{1: }|
+ {udn:aw}{dn:ord1}{n: W extra text 1 }{1: }|
{ums:aw}{s:ord2 W extra text 2 }{1: }|
- {dn:你好 W extra text 3 }{1: }|
+ {dn:你好}{n: W extra text 3 }{1: }|
{1:~ }|*15
{2:-- }{5:match 2 of 3} |
]])
@@ -5030,7 +5030,7 @@ describe('builtin popupmenu', function()
endif
return {
\ 'words': [
- \ { 'word': 'aword1', 'menu': 'extra text 1', 'kind': 'variable', 'kind_hlgroup': 'KindVar', 'hl_group': 'StrikeFake' },
+ \ { 'word': 'aword1', 'menu': 'extra text 1', 'kind': 'variable', 'kind_hlgroup': 'KindVar', 'abbr_hlgroup': 'StrikeFake' },
\ { 'word': 'aword2', 'menu': 'extra text 2', 'kind': 'function', 'kind_hlgroup': 'KindFunc' },
\ { 'word': '你好', 'menu': 'extra text 3', 'kind': 'class', 'kind_hlgroup': 'KindClass' },
\]}
@@ -5053,9 +5053,9 @@ describe('builtin popupmenu', function()
feed('S<C-X><C-U>')
screen:expect([[
aword1^ |
- {ds:aword1 }{kvs:variable }{ds:extra text 1 }{1: }|
- {n:aword2 }{kfn:function }{n:extra text 2 }{1: }|
- {n:你好 }{kcn:class }{n:extra text 3 }{1: }|
+ {ds:aword1}{s: }{kvs:variable}{s: extra text 1 }{1: }|
+ {n:aword2 }{kfn:function}{n: extra text 2 }{1: }|
+ {n:你好 }{kcn:class}{n: extra text 3 }{1: }|
{1:~ }|*15
{2:-- }{5:match 1 of 3} |
]])
diff --git a/test/old/testdir/test_popup.vim b/test/old/testdir/test_popup.vim
index 472882fb87..d35d32b13d 100644
--- a/test/old/testdir/test_popup.vim
+++ b/test/old/testdir/test_popup.vim
@@ -1506,7 +1506,7 @@ func Test_pum_highlights_match()
call StopVimInTerminal(buf)
endfunc
-func Test_pum_user_hl_group()
+func Test_pum_user_abbr_hlgroup()
CheckScreendump
let lines =<< trim END
func CompleteFunc( findstart, base )
@@ -1515,9 +1515,9 @@ func Test_pum_user_hl_group()
endif
return {
\ 'words': [
- \ { 'word': 'aword1', 'menu': 'extra text 1', 'kind': 'W', 'hl_group': 'StrikeFake' },
+ \ { 'word': 'aword1', 'menu': 'extra text 1', 'kind': 'W', 'abbr_hlgroup': 'StrikeFake' },
\ { 'word': 'aword2', 'menu': 'extra text 2', 'kind': 'W', },
- \ { 'word': '你好', 'menu': 'extra text 3', 'kind': 'W', 'hl_group': 'StrikeFake' },
+ \ { 'word': '你好', 'menu': 'extra text 3', 'kind': 'W', 'abbr_hlgroup': 'StrikeFake' },
\]}
endfunc
set completeopt=menu
@@ -1559,7 +1559,7 @@ func Test_pum_user_kind_hlgroup()
endif
return {
\ 'words': [
- \ { 'word': 'aword1', 'menu': 'extra text 1', 'kind': 'variable', 'kind_hlgroup': 'KindVar', 'hl_group': 'StrikeFake' },
+ \ { 'word': 'aword1', 'menu': 'extra text 1', 'kind': 'variable', 'kind_hlgroup': 'KindVar', 'abbr_hlgroup': 'StrikeFake' },
\ { 'word': 'aword2', 'menu': 'extra text 2', 'kind': 'function', 'kind_hlgroup': 'KindFunc' },
\ { 'word': '你好', 'menu': 'extra text 3', 'kind': 'class', 'kind_hlgroup': 'KindClass' },
\]}
generated by cgit (git 2.34.1) at 2025-06-19 18:58:31 +0000