From 08c328b8b079334e7fb38472339c4f8ba1a0df3b Mon Sep 17 00:00:00 2001
From: Phạm Bình An <111893501+brianhuster@users.noreply.github.com>
Date: Tue, 18 Mar 2025 05:41:07 +0700
Subject: feat(runtime): Lua ftplugin 'includeexpr' #32719

Problem:
Current `'includeexpr'` in runtime/ftplugin/lua.vim doesn't work with Nvim Lua.

Solution:
Provide an improved 'includeexpr' for Lua in "ftplugin/lua.lua".

Closes: https://github.com/neovim/neovim/issues/32490
---
 runtime/ftplugin/lua.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'runtime/ftplugin')

diff --git a/runtime/ftplugin/lua.lua b/runtime/ftplugin/lua.lua
index e0f7e95cf6..ef8f126fab 100644
--- a/runtime/ftplugin/lua.lua
+++ b/runtime/ftplugin/lua.lua
@@ -1,9 +1,10 @@
 -- use treesitter over syntax
 vim.treesitter.start()
 
+vim.bo.includeexpr = 'v:lua.require"vim._ftplugin.lua".includeexpr()'
 vim.bo.omnifunc = 'v:lua.vim.lua_omnifunc'
 vim.wo[0][0].foldexpr = 'v:lua.vim.treesitter.foldexpr()'
 
 vim.b.undo_ftplugin = (vim.b.undo_ftplugin or '')
   .. '\n call v:lua.vim.treesitter.stop()'
-  .. '\n setl omnifunc< foldexpr<'
+  .. '\n setl omnifunc< foldexpr< includeexpr<'
-- 
cgit