mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-07 11:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(vim.opt): unify vim.bo/wo building

Browse Source
This commit is contained in:
Lewis Russell
2022-09-08 15:56:35 +01:00
parent 164752b380
commit 7533ceec13
2 changed files with 31 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
runtime/lua/vim/_meta.lua
View File

@@ -54,76 +54,42 @@ vim.env = setmetatable({}, {
end, end,
}) })
do -- buffer option accessor local function opt_validate(option_name, target_scope)
local function buf_opt_validate(k) local scope = options_info[option_name].scope
local scope = options_info[k].scope if scope ~= target_scope then
if scope == 'win' then local scope_to_string = { buf = 'buffer', win = 'window' }
error( error(
string.format([['%s' is a window option, not a buffer option. See ":help %s"]], k, k) string.format(
[['%s' is a %s option, not a %s option. See ":help %s"]],
option_name,
scope_to_string[scope] or scope,
scope_to_string[target_scope] or target_scope,
option_name
) )
elseif scope == 'global' then )
error(
string.format([['%s' is a global option, not a buffer option. See ":help %s"]], k, k)
)
end
end end
local function new_buf_opt_accessor(bufnr)
return setmetatable({},{
__index = function(_, k)
if bufnr == nil and type(k) == 'number' then
return new_buf_opt_accessor(k)
end
buf_opt_validate(k)
return a.nvim_get_option_value(k, { buf = bufnr or 0 })
end,
__newindex = function(_, k, v)
buf_opt_validate(k)
return a.nvim_set_option_value(k, v, { buf = bufnr or 0 })
end,
})
end
vim.bo = new_buf_opt_accessor(nil)
end end
do -- window option accessor local function new_opt_accessor(handle, scope)
local function win_opt_validate(k) return setmetatable({}, {
local scope = options_info[k].scope __index = function(_, k)
if scope == 'buf' then if handle == nil and type(k) == 'number' then
error( return new_opt_accessor(k, scope)
string.format([['%s' is a buffer option, not a window option. See ":help %s"]], k, k) end
) opt_validate(k, scope)
elseif scope == 'global' then return a.nvim_get_option_value(k, { [scope] = handle or 0 })
error( end,
string.format([['%s' is a global option, not a window option. See ":help %s"]], k, k)
)
end
end
local function new_win_opt_accessor(winnr) __newindex = function(_, k, v)
return setmetatable({}, { opt_validate(k, scope)
__index = function(_, k) return a.nvim_set_option_value(k, v, { [scope] = handle or 0 })
if winnr == nil and type(k) == 'number' then end,
return new_win_opt_accessor(k) })
end
win_opt_validate(k)
return a.nvim_get_option_value(k, { win = winnr or 0 })
end,
__newindex = function(_, k, v)
win_opt_validate(k)
return a.nvim_set_option_value(k, v, { win = winnr or 0 })
end,
})
end
vim.wo = new_win_opt_accessor(nil)
end end
vim.bo = new_opt_accessor(nil, 'buf')
vim.wo = new_opt_accessor(nil, 'win')
-- vim global option -- vim global option
-- this ONLY sets the global option. like `setglobal` -- this ONLY sets the global option. like `setglobal`
vim.go = setmetatable({}, { vim.go = setmetatable({}, {

4
test/functional/lua/vim_spec.lua
View File

@@ -1396,7 +1396,7 @@ describe('lua stdlib', function()
]] ]]
eq('', funcs.luaeval "vim.bo.filetype") eq('', funcs.luaeval "vim.bo.filetype")
eq(true, funcs.luaeval "vim.bo[BUF].modifiable") eq(true, funcs.luaeval "vim.bo[BUF].modifiable")
matches("unknown option 'nosuchopt'$", matches("no such option: 'nosuchopt'$",
pcall_err(exec_lua, 'return vim.bo.nosuchopt')) pcall_err(exec_lua, 'return vim.bo.nosuchopt'))
matches("Expected lua string$", matches("Expected lua string$",
pcall_err(exec_lua, 'return vim.bo[0][0].autoread')) pcall_err(exec_lua, 'return vim.bo[0][0].autoread'))
@@ -1417,7 +1417,7 @@ describe('lua stdlib', function()
eq(0, funcs.luaeval "vim.wo.cole") eq(0, funcs.luaeval "vim.wo.cole")
eq(0, funcs.luaeval "vim.wo[0].cole") eq(0, funcs.luaeval "vim.wo[0].cole")
eq(0, funcs.luaeval "vim.wo[1001].cole") eq(0, funcs.luaeval "vim.wo[1001].cole")
matches("unknown option 'notanopt'$", matches("no such option: 'notanopt'$",
pcall_err(exec_lua, 'return vim.wo.notanopt')) pcall_err(exec_lua, 'return vim.wo.notanopt'))
matches("Expected lua string$", matches("Expected lua string$",
pcall_err(exec_lua, 'return vim.wo[0][0].list')) pcall_err(exec_lua, 'return vim.wo[0][0].list'))