mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-05 19:08:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24147 from clason/fix/ftplugin

Browse Source 
fix(ftplugin): respect runtimepath ordering
This commit is contained in:
zeertzjq
2023-06-30 18:22:02 +08:00
committed by GitHub
parent 37079fca58 6cceef6d4c
commit 751b9d73fd
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
runtime/ftplugin.vim
View File

@@ -30,9 +30,10 @@ augroup filetypeplugin
for name in split(s, '\.')
" Load Lua ftplugins after Vim ftplugins _per directory_
" TODO(clason): use nvim__get_runtime when supports globs and modeline
exe printf('runtime! ftplugin/%s.vim ftplugin/%s.lua', name, name)
exe printf('runtime! ftplugin/%s_*.vim ftplugin/%s_*.lua', name, name)
exe printf('runtime! ftplugin/%s/*.vim ftplugin/%s/*.lua', name, name)
exe printf('runtime! ftplugin/%s.vim ftplugin/%s.lua
\ ftplugin/%s_*.vim ftplugin/%s_*.lua
\ ftplugin/%s/*.vim ftplugin/%s/*.lua',
\ name, name, name, name, name, name)
endfor
endif
endfunc

24
test/functional/lua/runtime_spec.lua
View File

@@ -138,6 +138,30 @@ describe('runtime:', function()
exec [[set filetype=new-ft]]
eq(1, eval('b:lua_ftplugin'))
end)
it("'rtp' order is respected", function()
local after_ftplugin_folder = table.concat({plug_dir, 'after', 'ftplugin'}, sep)
mkdir_p(table.concat({ftplugin_folder, 'new-ft'}, sep))
mkdir_p(table.concat({after_ftplugin_folder, 'new-ft'}, sep))
exec('set rtp+=' .. plug_dir .. '/after')
exec('let g:seq = ""')
-- A .lua file is loaded after a .vim file if they only differ in extension.
-- All files in after/ftplugin/ are loaded after all files in ftplugin/.
write_file(table.concat({ftplugin_folder, 'new-ft.vim'}, sep), [[let g:seq ..= 'A']])
write_file(table.concat({ftplugin_folder, 'new-ft.lua'}, sep), [[vim.g.seq = vim.g.seq .. 'B']])
write_file(table.concat({ftplugin_folder, 'new-ft_a.vim'}, sep), [[let g:seq ..= 'C']])
write_file(table.concat({ftplugin_folder, 'new-ft_a.lua'}, sep), [[vim.g.seq = vim.g.seq .. 'D']])
write_file(table.concat({ftplugin_folder, 'new-ft', 'a.vim'}, sep), [[let g:seq ..= 'E']])
write_file(table.concat({ftplugin_folder, 'new-ft', 'a.lua'}, sep), [[vim.g.seq = vim.g.seq .. 'F']])
write_file(table.concat({after_ftplugin_folder, 'new-ft.vim'}, sep), [[let g:seq ..= 'a']])
write_file(table.concat({after_ftplugin_folder, 'new-ft.lua'}, sep), [[vim.g.seq = vim.g.seq .. 'b']])
write_file(table.concat({after_ftplugin_folder, 'new-ft_a.vim'}, sep), [[let g:seq ..= 'c']])
write_file(table.concat({after_ftplugin_folder, 'new-ft_a.lua'}, sep), [[vim.g.seq = vim.g.seq .. 'd']])
write_file(table.concat({after_ftplugin_folder, 'new-ft', 'a.vim'}, sep), [[let g:seq ..= 'e']])
write_file(table.concat({after_ftplugin_folder, 'new-ft', 'a.lua'}, sep), [[vim.g.seq = vim.g.seq .. 'f']])
exec('setfiletype new-ft')
eq('ABCDEFabcdef', eval('g:seq'))
end)
end)
describe('indent', function()