neovim

commit 12ccea59674602ddf44d6e2394bf9da87b6feeb9
parent 996dd36c77321ea91758b5996d152a2f37af99dd
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Tue,  1 Aug 2023 11:57:46 +0800

build: fix --luamod-dev not working properly (#24519)

Fixes a regression from #23112.
Diffstat:
M
src/nvim/CMakeLists.txt
 | 
10
++++++----

1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
@@ -530,24 +530,26 @@ add_custom_command(
   COMMAND ${CMAKE_COMMAND} -E env
       "LUAC_PRG=${LUAC_PRG}"
       ${LUA_PRG} ${CHAR_BLOB_GENERATOR} -c ${VIM_MODULE_FILE}
+      # NB: vim._init_packages and vim.inspect must be be first and second ones
+      # respectively, otherwise --luamod-dev won't work properly.
+      ${LUA_INIT_PACKAGES_MODULE_SOURCE} "vim._init_packages"
+      ${LUA_INSPECT_MODULE_SOURCE} "vim.inspect"
       ${LUA_EDITOR_MODULE_SOURCE} "vim._editor"
       ${LUA_FILETYPE_MODULE_SOURCE} "vim.filetype"
       ${LUA_FS_MODULE_SOURCE} "vim.fs"
       ${LUA_F_MODULE_SOURCE} "vim.F"
-      ${LUA_INIT_PACKAGES_MODULE_SOURCE} "vim._init_packages"
-      ${LUA_INSPECT_MODULE_SOURCE} "vim.inspect"
       ${LUA_KEYMAP_MODULE_SOURCE} "vim.keymap"
       ${LUA_LOADER_MODULE_SOURCE} "vim.loader"
       ${LUA_OPTIONS_MODULE_SOURCE} "vim._options"
       ${LUA_SHARED_MODULE_SOURCE} "vim.shared"
   DEPENDS
     ${CHAR_BLOB_GENERATOR}
+    ${LUA_INIT_PACKAGES_MODULE_SOURCE}
+    ${LUA_INSPECT_MODULE_SOURCE}
     ${LUA_EDITOR_MODULE_SOURCE}
     ${LUA_FILETYPE_MODULE_SOURCE}
     ${LUA_FS_MODULE_SOURCE}
     ${LUA_F_MODULE_SOURCE}
-    ${LUA_INIT_PACKAGES_MODULE_SOURCE}
-    ${LUA_INSPECT_MODULE_SOURCE}
     ${LUA_KEYMAP_MODULE_SOURCE}
     ${LUA_LOADER_MODULE_SOURCE}
     ${LUA_OPTIONS_MODULE_SOURCE}