diff --git a/.luacov b/.luacov index f8eb28e3f7..da48a1e746 100644 --- a/.luacov +++ b/.luacov @@ -15,7 +15,7 @@ return { '^[^/\\.]', }, modules = { - ['vim'] = 'runtime/lua/vim/shared.lua' + ['vim'] = 'runtime/lua/vim/_core/shared.lua' }, } diff --git a/runtime/lua/vim/shared.lua b/runtime/lua/vim/_core/shared.lua similarity index 100% rename from runtime/lua/vim/shared.lua rename to runtime/lua/vim/_core/shared.lua diff --git a/runtime/lua/vim/_init_packages.lua b/runtime/lua/vim/_init_packages.lua index e015315f0f..b5c0a0f603 100644 --- a/runtime/lua/vim/_init_packages.lua +++ b/runtime/lua/vim/_init_packages.lua @@ -50,7 +50,7 @@ if vim.api then end -- builtin functions which always should be available -require('vim.shared') +require('vim._core.shared') vim._submodules = { inspect = true, diff --git a/src/gen/gen_vimdoc.lua b/src/gen/gen_vimdoc.lua index 60a5f6f644..e90158d502 100755 --- a/src/gen/gen_vimdoc.lua +++ b/src/gen/gen_vimdoc.lua @@ -189,6 +189,7 @@ local config = { files = { 'runtime/lua/vim/_core/editor.lua', 'runtime/lua/vim/_core/options.lua', + 'runtime/lua/vim/_core/shared.lua', 'runtime/lua/vim/_core/system.lua', 'runtime/lua/vim/_extui.lua', 'runtime/lua/vim/_inspector.lua', @@ -211,7 +212,6 @@ local config = { 'runtime/lua/vim/pos.lua', 'runtime/lua/vim/range.lua', 'runtime/lua/vim/secure.lua', - 'runtime/lua/vim/shared.lua', 'runtime/lua/vim/snippet.lua', 'runtime/lua/vim/text.lua', 'runtime/lua/vim/ui.lua', @@ -219,7 +219,7 @@ local config = { 'runtime/lua/vim/version.lua', }, fn_xform = function(fun) - if contains(fun.module, { 'vim.uri', 'vim.shared', 'vim._core.editor' }) then + if contains(fun.module, { 'vim.uri', 'vim._core.shared', 'vim._core.editor' }) then fun.module = 'vim' end diff --git a/src/gen/preload_nlua.lua b/src/gen/preload_nlua.lua index 8d685f2ca1..8980984738 100644 --- a/src/gen/preload_nlua.lua +++ b/src/gen/preload_nlua.lua @@ -7,7 +7,7 @@ package.path = (srcdir .. '/src/?.lua;') .. (gendir .. '/?.lua;') .. package.path -_G.vim = require 'vim.shared' +_G.vim = require 'vim._core.shared' _G.vim.inspect = require 'vim.inspect' _G.vim.iter = require 'vim.iter' package.cpath = package.cpath .. ';' .. nlualib diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index 0c6207ee8b..9714a6496a 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -349,7 +349,6 @@ set(LUA_INIT_PACKAGES_MODULE_SOURCE ${NVIM_RUNTIME_DIR}/lua/vim/_init_packages.l set(LUA_INSPECT_MODULE_SOURCE ${NVIM_RUNTIME_DIR}/lua/vim/inspect.lua) set(LUA_KEYMAP_MODULE_SOURCE ${NVIM_RUNTIME_DIR}/lua/vim/keymap.lua) set(LUA_LOADER_MODULE_SOURCE ${NVIM_RUNTIME_DIR}/lua/vim/loader.lua) -set(LUA_SHARED_MODULE_SOURCE ${NVIM_RUNTIME_DIR}/lua/vim/shared.lua) set(LUA_TEXT_MODULE_SOURCE ${NVIM_RUNTIME_DIR}/lua/vim/text.lua) # Find all Lua modules in the _core/ directory. @@ -641,7 +640,6 @@ add_custom_command( ${LUA_F_MODULE_SOURCE} "vim.F" ${LUA_KEYMAP_MODULE_SOURCE} "vim.keymap" ${LUA_LOADER_MODULE_SOURCE} "vim.loader" - ${LUA_SHARED_MODULE_SOURCE} "vim.shared" ${LUA_TEXT_MODULE_SOURCE} "vim.text" ${LUA_CORE_COMMAND_ARGS} DEPENDS @@ -653,7 +651,6 @@ add_custom_command( ${LUA_F_MODULE_SOURCE} ${LUA_KEYMAP_MODULE_SOURCE} ${LUA_LOADER_MODULE_SOURCE} - ${LUA_SHARED_MODULE_SOURCE} ${LUA_TEXT_MODULE_SOURCE} ${LUA_CORE_MODULE_SOURCES} VERBATIM diff --git a/test/functional/core/main_spec.lua b/test/functional/core/main_spec.lua index e3fde5c891..400b27a278 100644 --- a/test/functional/core/main_spec.lua +++ b/test/functional/core/main_spec.lua @@ -224,6 +224,7 @@ describe('vim._core', function() 'vim._core.exrc', 'vim._core.options', 'vim._core.server', + 'vim._core.shared', 'vim._core.stringbuffer', 'vim._core.system', 'vim._core.util', @@ -233,7 +234,6 @@ describe('vim._core', function() 'vim.inspect', 'vim.keymap', 'vim.loader', - 'vim.shared', 'vim.text', } if n.exec_lua [[return not not _G.jit]] then diff --git a/test/functional/lua/vim_spec.lua b/test/functional/lua/vim_spec.lua index e8ba0b9fcc..c752be128a 100644 --- a/test/functional/lua/vim_spec.lua +++ b/test/functional/lua/vim_spec.lua @@ -3009,7 +3009,7 @@ describe('lua: builtin modules', function() '+qa!', }):gsub('\r\n', '\n') eq(1, eval('v:shell_error')) - matches("'vim%.shared' not found", out) + matches("'vim%._core.shared' not found", out) end) end)