From 901dd79f6a5ee78a55d726abca868bebff117ca9 Mon Sep 17 00:00:00 2001 From: TJ DeVries Date: Tue, 24 Nov 2020 23:24:52 -0500 Subject: feat: add completion to ':lua' --- test/functional/viml/completion_spec.lua | 42 +++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) (limited to 'test/functional/viml') diff --git a/test/functional/viml/completion_spec.lua b/test/functional/viml/completion_spec.lua index 01fc50289d..d59a1a3306 100644 --- a/test/functional/viml/completion_spec.lua +++ b/test/functional/viml/completion_spec.lua @@ -26,6 +26,7 @@ describe('completion', function() [7] = {foreground = Screen.colors.White, background = Screen.colors.Red}, [8] = {reverse = true}, [9] = {bold = true, reverse = true}, + [10] = {foreground = Screen.colors.Grey0, background = Screen.colors.Yellow}, }) end) @@ -895,8 +896,47 @@ describe('completion', function() ]]) end) - describe('from the commandline window', function() + describe('lua completion', function() + it('expands when there is only one match', function() + feed(':lua CURRENT_TESTING_VAR = 1') + feed(':lua CURRENT_TESTING_') + screen:expect{grid=[[ + | + {0:~ }| + {0:~ }| + {0:~ }| + {0:~ }| + {0:~ }| + {0:~ }| + :lua CURRENT_TESTING_VAR^ | + ]]} + end) + it('expands when there is only one match', function() + feed(':lua CURRENT_TESTING_FOO = 1') + feed(':lua CURRENT_TESTING_BAR = 1') + feed(':lua CURRENT_TESTING_') + screen:expect{ grid = [[ + | + {0:~ }| + {0:~ }| + {0:~ }| + {0:~ }| + {0:~ }| + {10:CURRENT_TESTING_BAR}{9: CURRENT_TESTING_FOO }| + :lua CURRENT_TESTING_BAR^ | + ]], unchanged = true } + end) + + it('provides completion from `getcompletion()`', function() + eq({'vim'}, meths.call_function('getcompletion', {'vi', 'lua'})) + eq({'vim.api'}, meths.call_function('getcompletion', {'vim.ap', 'lua'})) + eq({'vim.tbl_filter'}, meths.call_function('getcompletion', {'vim.tbl_fil', 'lua'})) + eq({'print(vim'}, meths.call_function('getcompletion', {'print(vi', 'lua'})) + end) + end) + + describe('from the commandline window', function() it('is cleared after CTRL-C', function () feed('q:') feed('ifoo faa fee f') -- cgit From d95a465b4399c3c10b83925935ec5f4807d65b60 Mon Sep 17 00:00:00 2001 From: Tony Chen Date: Mon, 30 Nov 2020 08:33:52 -0500 Subject: Don't show entire context when completing --- test/functional/viml/completion_spec.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'test/functional/viml') diff --git a/test/functional/viml/completion_spec.lua b/test/functional/viml/completion_spec.lua index d59a1a3306..a4241fe5aa 100644 --- a/test/functional/viml/completion_spec.lua +++ b/test/functional/viml/completion_spec.lua @@ -3,6 +3,7 @@ local Screen = require('test.functional.ui.screen') local clear, feed = helpers.clear, helpers.feed local eval, eq, neq = helpers.eval, helpers.eq, helpers.neq local feed_command, source, expect = helpers.feed_command, helpers.source, helpers.expect +local funcs = helpers.funcs local curbufmeths = helpers.curbufmeths local command = helpers.command local meths = helpers.meths @@ -929,10 +930,10 @@ describe('completion', function() end) it('provides completion from `getcompletion()`', function() - eq({'vim'}, meths.call_function('getcompletion', {'vi', 'lua'})) - eq({'vim.api'}, meths.call_function('getcompletion', {'vim.ap', 'lua'})) - eq({'vim.tbl_filter'}, meths.call_function('getcompletion', {'vim.tbl_fil', 'lua'})) - eq({'print(vim'}, meths.call_function('getcompletion', {'print(vi', 'lua'})) + eq({'vim'}, funcs.getcompletion('vi', 'lua')) + eq({'api'}, funcs.getcompletion('vim.ap', 'lua')) + eq({'tbl_filter'}, funcs.getcompletion('vim.tbl_fil', 'lua')) + eq({'vim'}, funcs.getcompletion('print(vi', 'lua')) end) end) -- cgit