From db2b774a16414a7b964736c0e896ddd40d25ca3f Mon Sep 17 00:00:00 2001
From: Phạm Bình An <111893501+brianhuster@users.noreply.github.com>
Date: Tue, 6 May 2025 19:15:31 +0700
Subject: fix(runtime): 'includeexpr' with non-Nvim-style Lua modules #33867

Closes #33862
---
 runtime/lua/vim/_ftplugin/lua.lua | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'runtime/lua/vim/_ftplugin/lua.lua')

diff --git a/runtime/lua/vim/_ftplugin/lua.lua b/runtime/lua/vim/_ftplugin/lua.lua
index d81393192d..778817a665 100644
--- a/runtime/lua/vim/_ftplugin/lua.lua
+++ b/runtime/lua/vim/_ftplugin/lua.lua
@@ -3,13 +3,15 @@ local M = {}
 --- @param module string
 ---@return string
 function M.includeexpr(module)
-  local fname = module:gsub('%.', '/')
+  module = module:gsub('%.', '/')
 
   local root = vim.fs.root(vim.api.nvim_buf_get_name(0), 'lua') or vim.fn.getcwd()
-  for _, suf in ipairs { '.lua', '/init.lua' } do
-    local path = vim.fs.joinpath(root, 'lua', fname .. suf)
-    if vim.uv.fs_stat(path) then
-      return path
+  for _, fname in ipairs { module, vim.fs.joinpath(root, 'lua', module) } do
+    for _, suf in ipairs { '.lua', '/init.lua' } do
+      local path = fname .. suf
+      if vim.uv.fs_stat(path) then
+        return path
+      end
     end
   end
 
-- 
cgit