GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-16 09:11:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30344 from tris203/backport-30342-to-release-0.10

Browse Source 
fix(health): "test_plug/health/init.lua" completes "test_plug"
This commit is contained in:
zeertzjq
2024-09-12 10:31:43 +08:00
committed by GitHub
parent ef05c514aa 61b0816790
commit 23a9c67f1b
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/lua/vim/health.lua
View File

@ -350,8 +350,8 @@ local path2name = function(path)
-- Remove everything up to the last /lua/ folder
path = path:gsub('^.*/lua/', '')
-- Remove the filename (health.lua)
path = vim.fs.dirname(path)
-- Remove the filename (health.lua) or (health/init.lua)
path = vim.fs.dirname(path:gsub('/init%.lua$', ''))
-- Change slashes to dots
path = path:gsub('/', '.')

30
test/functional/plugin/health_spec.lua
View File

@ -5,7 +5,7 @@ local Screen = require('test.functional.ui.screen')
local clear = n.clear
local curbuf_contents = n.curbuf_contents
local command = n.command
local eq, neq, matches = t.eq, t.neq, t.matches
local eq, matches = t.eq, t.matches
local getcompletion = n.fn.getcompletion
local insert = n.insert
local exec_lua = n.exec_lua
@ -40,12 +40,18 @@ describe(':checkhealth', function()
matches('ERROR $VIM .* zub', curbuf_contents())
end)
it('completions can be listed via getcompletion()', function()
clear()
eq('nvim', getcompletion('nvim', 'checkhealth')[1])
eq('provider.clipboard', getcompletion('prov', 'checkhealth')[1])
eq('vim.lsp', getcompletion('vim.ls', 'checkhealth')[1])
neq('vim', getcompletion('^vim', 'checkhealth')[1]) -- should not complete vim.health
it('getcompletion()', function()
clear { args = { '-u', 'NORC', '+set runtimepath+=test/functional/fixtures' } }
-- "test_plug/health/init.lua" should complete as "test_plug", not "test_plug.health". #30342
eq({
'test_plug',
'test_plug.full_render',
'test_plug.submodule',
'test_plug.submodule_empty',
'test_plug.success1',
'test_plug.success2',
}, getcompletion('test_plug', 'checkhealth'))
end)
it('completion checks for vim.health._complete() return type #28456', function()
@ -58,11 +64,9 @@ describe(':checkhealth', function()
end)
end)
describe('health.vim', function()
describe('vim.health', function()
before_each(function()
clear { args = { '-u', 'NORC' } }
-- Provides healthcheck functions
command('set runtimepath+=test/functional/fixtures')
clear { args = { '-u', 'NORC', '+set runtimepath+=test/functional/fixtures' } }
end)
describe(':checkhealth', function()
@ -208,9 +212,7 @@ end)
describe(':checkhealth window', function()
before_each(function()
clear { args = { '-u', 'NORC' } }
-- Provides healthcheck functions
command('set runtimepath+=test/functional/fixtures')
clear { args = { '-u', 'NORC', '+set runtimepath+=test/functional/fixtures' } }
command('set nofoldenable nowrap laststatus=0')
end)