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

vim-patch:0b82054: runtime(lua): Improve 'include' and make '*expr' functions script-local

Browse Source 
- Prevent 'include' from matching variable assignments as calls to
  require() and others.
- Use script-local functions for 'includeexpr' and 'foldexpr'.
- Formatting fixes.

closes: vim/vim#16746

0b8205484b

Co-authored-by: Doug Kearns <dougkearns@gmail.com>
This commit is contained in:
brianhuster
2025-03-01 01:41:32 +07:00
committed by zeertzjq
parent 2b0f967b77
commit 47b748af54
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
runtime/ftplugin/lua.vim
View File

@@ -5,7 +5,7 @@
" Contributor: Dorai Sitaram <ds26@gte.com> " Contributor: Dorai Sitaram <ds26@gte.com>
" C.D. MacEachern <craig.daniel.maceachern@gmail.com> " C.D. MacEachern <craig.daniel.maceachern@gmail.com>
" Phạm Bình An <phambinhanctb2004@gmail.com> " Phạm Bình An <phambinhanctb2004@gmail.com>
" Last Change: 2025 Feb 25 " Last Change: 2025 Feb 27
if exists("b:did_ftplugin") if exists("b:did_ftplugin")
finish finish
@@ -31,11 +31,11 @@ setlocal formatoptions-=t formatoptions+=croql
let &l:define = '\<function\|\<local\%(\s\+function\)\=' let &l:define = '\<function\|\<local\%(\s\+function\)\='
let &l:include = '\v<((do|load)file|require)[^''"]*[''"]\zs[^''"]+' let &l:include = '\<\%(\%(do\|load\)file\|require\)\s*('
setlocal includeexpr=LuaInclude(v:fname) setlocal includeexpr=s:LuaInclude(v:fname)
setlocal suffixesadd=.lua setlocal suffixesadd=.lua
let b:undo_ftplugin = "setlocal cms< com< def< fo< inc< inex< sua<" let b:undo_ftplugin = "setl cms< com< def< fo< inc< inex< sua<"
if exists("loaded_matchit") && !exists("b:match_words") if exists("loaded_matchit") && !exists("b:match_words")
let b:match_ignorecase = 0 let b:match_ignorecase = 0
@@ -66,10 +66,10 @@ if exists("s:loaded_lua") || &cp
endif endif
let s:loaded_lua = 1 let s:loaded_lua = 1
function LuaInclude(fname) abort function s:LuaInclude(fname) abort
let lua_ver = str2float(printf("%d.%02d", g:lua_version, g:lua_subversion)) let lua_ver = str2float(printf("%d.%02d", g:lua_version, g:lua_subversion))
let fname = tr(a:fname, '.', '/') let fname = tr(a:fname, '.', '/')
let paths = lua_ver >= 5.03 ? [ fname.'.lua', fname.'/init.lua' ] : [ fname.'.lua' ] let paths = lua_ver >= 5.03 ? [fname .. ".lua", fname .. "/init.lua"] : [fname .. ".lua"]
for path in paths for path in paths
if filereadable(path) if filereadable(path)
return path return path