build: move shared.lua to _core/

This commit is contained in:
Justin M. Keyes
2025-12-20 21:51:54 -05:00
parent 20e77c5d88
commit 1d70c96e5b
8 changed files with 7 additions and 10 deletions

View File

@@ -15,7 +15,7 @@ return {
'^[^/\\.]',
},
modules = {
['vim'] = 'runtime/lua/vim/shared.lua'
['vim'] = 'runtime/lua/vim/_core/shared.lua'
},
}

View File

@@ -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,

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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)