mirror of
https://github.com/neovim/neovim.git
synced 2025-11-22 10:06:33 +00:00
refactor: use nvim.foo.bar format for namespaces
This commit is contained in:
@@ -46,7 +46,7 @@ local query = vim.treesitter.query.parse(
|
|||||||
(#set! @code lang @_lang))
|
(#set! @code lang @_lang))
|
||||||
]]
|
]]
|
||||||
)
|
)
|
||||||
local run_message_ns = vim.api.nvim_create_namespace('vimdoc/run_message')
|
local run_message_ns = vim.api.nvim_create_namespace('nvim.vimdoc.run_message')
|
||||||
|
|
||||||
vim.api.nvim_buf_clear_namespace(0, run_message_ns, 0, -1)
|
vim.api.nvim_buf_clear_namespace(0, run_message_ns, 0, -1)
|
||||||
for _, match, metadata in query:iter_matches(tree:root(), 0, 0, -1) do
|
for _, match, metadata in query:iter_matches(tree:root(), 0, 0, -1) do
|
||||||
|
|||||||
@@ -1402,7 +1402,7 @@ M.handlers.signs = {
|
|||||||
local ns = M.get_namespace(namespace)
|
local ns = M.get_namespace(namespace)
|
||||||
if not ns.user_data.sign_ns then
|
if not ns.user_data.sign_ns then
|
||||||
ns.user_data.sign_ns =
|
ns.user_data.sign_ns =
|
||||||
api.nvim_create_namespace(string.format('%s/diagnostic/signs', ns.name))
|
api.nvim_create_namespace(string.format('nvim.%s.diagnostic.signs', ns.name))
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Handle legacy diagnostic sign definitions
|
-- Handle legacy diagnostic sign definitions
|
||||||
@@ -1500,7 +1500,7 @@ M.handlers.underline = {
|
|||||||
local ns = M.get_namespace(namespace)
|
local ns = M.get_namespace(namespace)
|
||||||
if not ns.user_data.underline_ns then
|
if not ns.user_data.underline_ns then
|
||||||
ns.user_data.underline_ns =
|
ns.user_data.underline_ns =
|
||||||
api.nvim_create_namespace(string.format('%s/diagnostic/underline', ns.name))
|
api.nvim_create_namespace(string.format('nvim.%s.diagnostic.underline', ns.name))
|
||||||
end
|
end
|
||||||
|
|
||||||
local underline_ns = ns.user_data.underline_ns
|
local underline_ns = ns.user_data.underline_ns
|
||||||
@@ -1572,7 +1572,7 @@ M.handlers.virtual_text = {
|
|||||||
local ns = M.get_namespace(namespace)
|
local ns = M.get_namespace(namespace)
|
||||||
if not ns.user_data.virt_text_ns then
|
if not ns.user_data.virt_text_ns then
|
||||||
ns.user_data.virt_text_ns =
|
ns.user_data.virt_text_ns =
|
||||||
api.nvim_create_namespace(string.format('%s/diagnostic/virtual_text', ns.name))
|
api.nvim_create_namespace(string.format('nvim.%s.diagnostic.virtual_text', ns.name))
|
||||||
end
|
end
|
||||||
|
|
||||||
local virt_text_ns = ns.user_data.virt_text_ns
|
local virt_text_ns = ns.user_data.virt_text_ns
|
||||||
|
|||||||
@@ -115,7 +115,7 @@ function M.range(bufnr, ns, higroup, start, finish, opts)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local yank_ns = api.nvim_create_namespace('hlyank')
|
local yank_ns = api.nvim_create_namespace('nvim.hlyank')
|
||||||
local yank_timer --- @type uv.uv_timer_t?
|
local yank_timer --- @type uv.uv_timer_t?
|
||||||
local yank_cancel --- @type fun()?
|
local yank_cancel --- @type fun()?
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ local function client_positional_params(params)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local hover_ns = api.nvim_create_namespace('vim_lsp_hover_range')
|
local hover_ns = api.nvim_create_namespace('nvim.lsp.hover_range')
|
||||||
|
|
||||||
--- @class vim.lsp.buf.hover.Opts : vim.lsp.util.open_floating_preview.Opts
|
--- @class vim.lsp.buf.hover.Opts : vim.lsp.util.open_floating_preview.Opts
|
||||||
--- @field silent? boolean
|
--- @field silent? boolean
|
||||||
@@ -324,7 +324,7 @@ local function process_signature_help_results(results)
|
|||||||
return signatures
|
return signatures
|
||||||
end
|
end
|
||||||
|
|
||||||
local sig_help_ns = api.nvim_create_namespace('vim_lsp_signature_help')
|
local sig_help_ns = api.nvim_create_namespace('nvim.lsp.signature_help')
|
||||||
|
|
||||||
--- @class vim.lsp.buf.signature_help.Opts : vim.lsp.util.open_floating_preview.Opts
|
--- @class vim.lsp.buf.signature_help.Opts : vim.lsp.util.open_floating_preview.Opts
|
||||||
--- @field silent? boolean
|
--- @field silent? boolean
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ local lens_cache_by_buf = setmetatable({}, {
|
|||||||
---client_id -> namespace
|
---client_id -> namespace
|
||||||
local namespaces = setmetatable({}, {
|
local namespaces = setmetatable({}, {
|
||||||
__index = function(t, key)
|
__index = function(t, key)
|
||||||
local value = api.nvim_create_namespace('vim_lsp_codelens:' .. key)
|
local value = api.nvim_create_namespace('nvim.lsp.codelens:' .. key)
|
||||||
rawset(t, key, value)
|
rawset(t, key, value)
|
||||||
return value
|
return value
|
||||||
end,
|
end,
|
||||||
|
|||||||
@@ -382,7 +382,7 @@ end
|
|||||||
--- @diagnostic disable-next-line: deprecated
|
--- @diagnostic disable-next-line: deprecated
|
||||||
RCS[ms.textDocument_hover] = M.hover
|
RCS[ms.textDocument_hover] = M.hover
|
||||||
|
|
||||||
local sig_help_ns = api.nvim_create_namespace('vim_lsp_signature_help')
|
local sig_help_ns = api.nvim_create_namespace('nvim.lsp.signature_help')
|
||||||
|
|
||||||
--- @deprecated remove in 0.13
|
--- @deprecated remove in 0.13
|
||||||
--- |lsp-handler| for the method "textDocument/signatureHelp".
|
--- |lsp-handler| for the method "textDocument/signatureHelp".
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ local bufstates = vim.defaulttable(function(_)
|
|||||||
})
|
})
|
||||||
end)
|
end)
|
||||||
|
|
||||||
local namespace = api.nvim_create_namespace('vim_lsp_inlayhint')
|
local namespace = api.nvim_create_namespace('nvim.lsp.inlayhint')
|
||||||
local augroup = api.nvim_create_augroup('vim_lsp_inlayhint', {})
|
local augroup = api.nvim_create_augroup('vim_lsp_inlayhint', {})
|
||||||
|
|
||||||
--- |lsp-handler| for the method `textDocument/inlayHint`
|
--- |lsp-handler| for the method `textDocument/inlayHint`
|
||||||
|
|||||||
@@ -225,7 +225,7 @@ function STHighlighter:attach(client_id)
|
|||||||
local state = self.client_state[client_id]
|
local state = self.client_state[client_id]
|
||||||
if not state then
|
if not state then
|
||||||
state = {
|
state = {
|
||||||
namespace = api.nvim_create_namespace('vim_lsp_semantic_tokens:' .. client_id),
|
namespace = api.nvim_create_namespace('nvim.lsp.semantic_tokens:' .. client_id),
|
||||||
active_request = {},
|
active_request = {},
|
||||||
current_result = {},
|
current_result = {},
|
||||||
}
|
}
|
||||||
@@ -805,7 +805,7 @@ function M._refresh(err, _, ctx)
|
|||||||
return vim.NIL
|
return vim.NIL
|
||||||
end
|
end
|
||||||
|
|
||||||
local namespace = api.nvim_create_namespace('vim_lsp_semantic_tokens')
|
local namespace = api.nvim_create_namespace('nvim.lsp.semantic_tokens')
|
||||||
api.nvim_set_decoration_provider(namespace, {
|
api.nvim_set_decoration_provider(namespace, {
|
||||||
on_win = function(_, _, bufnr, topline, botline)
|
on_win = function(_, _, bufnr, topline, botline)
|
||||||
local highlighter = STHighlighter.active[bufnr]
|
local highlighter = STHighlighter.active[bufnr]
|
||||||
|
|||||||
@@ -1650,7 +1650,7 @@ function M.open_floating_preview(contents, syntax, opts)
|
|||||||
end
|
end
|
||||||
|
|
||||||
do --[[ References ]]
|
do --[[ References ]]
|
||||||
local reference_ns = api.nvim_create_namespace('vim_lsp_references')
|
local reference_ns = api.nvim_create_namespace('nvim.lsp.references')
|
||||||
|
|
||||||
--- Removes document highlights from a buffer.
|
--- Removes document highlights from a buffer.
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
local G = vim.lsp._snippet_grammar
|
local G = vim.lsp._snippet_grammar
|
||||||
local snippet_group = vim.api.nvim_create_augroup('vim/snippet', {})
|
local snippet_group = vim.api.nvim_create_augroup('vim/snippet', {})
|
||||||
local snippet_ns = vim.api.nvim_create_namespace('vim/snippet')
|
local snippet_ns = vim.api.nvim_create_namespace('nvim.snippet')
|
||||||
local hl_group = 'SnippetTabstop'
|
local hl_group = 'SnippetTabstop'
|
||||||
local jump_forward_key = '<tab>'
|
local jump_forward_key = '<tab>'
|
||||||
local jump_backward_key = '<s-tab>'
|
local jump_backward_key = '<s-tab>'
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
local api = vim.api
|
local api = vim.api
|
||||||
|
|
||||||
local namespace = api.nvim_create_namespace('vim.treesitter.query_linter')
|
local namespace = api.nvim_create_namespace('nvim.treesitter.query_linter')
|
||||||
|
|
||||||
local M = {}
|
local M = {}
|
||||||
|
|
||||||
|
|||||||
@@ -119,7 +119,7 @@ function TSTreeView:new(bufnr, lang)
|
|||||||
end
|
end
|
||||||
|
|
||||||
local t = {
|
local t = {
|
||||||
ns = api.nvim_create_namespace('treesitter/dev-inspect'),
|
ns = api.nvim_create_namespace('nvim.treesitter.dev_inspect'),
|
||||||
nodes = nodes,
|
nodes = nodes,
|
||||||
named = named,
|
named = named,
|
||||||
---@type vim.treesitter.dev.TSTreeViewOpts
|
---@type vim.treesitter.dev.TSTreeViewOpts
|
||||||
@@ -135,7 +135,7 @@ function TSTreeView:new(bufnr, lang)
|
|||||||
return t
|
return t
|
||||||
end
|
end
|
||||||
|
|
||||||
local decor_ns = api.nvim_create_namespace('ts.dev')
|
local decor_ns = api.nvim_create_namespace('nvim.treesitter.dev')
|
||||||
|
|
||||||
---@param range Range4
|
---@param range Range4
|
||||||
---@return string
|
---@return string
|
||||||
@@ -547,7 +547,7 @@ function M.inspect_tree(opts)
|
|||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
local edit_ns = api.nvim_create_namespace('treesitter/dev-edit')
|
local edit_ns = api.nvim_create_namespace('nvim.treesitter.dev_edit')
|
||||||
|
|
||||||
---@param query_win integer
|
---@param query_win integer
|
||||||
---@param base_win integer
|
---@param base_win integer
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ local api = vim.api
|
|||||||
local query = vim.treesitter.query
|
local query = vim.treesitter.query
|
||||||
local Range = require('vim.treesitter._range')
|
local Range = require('vim.treesitter._range')
|
||||||
|
|
||||||
local ns = api.nvim_create_namespace('treesitter/highlighter')
|
local ns = api.nvim_create_namespace('nvim.treesitter.highlighter')
|
||||||
|
|
||||||
---@alias vim.treesitter.highlighter.Iter fun(end_line: integer|nil): integer, TSNode, vim.treesitter.query.TSMetadata, TSQueryMatch
|
---@alias vim.treesitter.highlighter.Iter fun(end_line: integer|nil): integer, TSNode, vim.treesitter.query.TSMetadata, TSQueryMatch
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ local M = {}
|
|||||||
--- Note: {patterns} is assumed to be sorted by occurrence in the file.
|
--- Note: {patterns} is assumed to be sorted by occurrence in the file.
|
||||||
--- @param patterns {start:string,stop:string,match:string}[]
|
--- @param patterns {start:string,stop:string,match:string}[]
|
||||||
function M.highlight_groups(patterns)
|
function M.highlight_groups(patterns)
|
||||||
local ns = vim.api.nvim_create_namespace('vimhelp')
|
local ns = vim.api.nvim_create_namespace('nvim.vimhelp')
|
||||||
vim.api.nvim_buf_clear_namespace(0, ns, 0, -1)
|
vim.api.nvim_buf_clear_namespace(0, ns, 0, -1)
|
||||||
|
|
||||||
local save_cursor = vim.fn.getcurpos()
|
local save_cursor = vim.fn.getcurpos()
|
||||||
|
|||||||
@@ -144,7 +144,7 @@ describe('vim.hl.on_yank', function()
|
|||||||
vim.api.nvim_buf_set_mark(0, ']', 1, 1, {})
|
vim.api.nvim_buf_set_mark(0, ']', 1, 1, {})
|
||||||
vim.hl.on_yank({ timeout = math.huge, on_macro = true, event = { operator = 'y' } })
|
vim.hl.on_yank({ timeout = math.huge, on_macro = true, event = { operator = 'y' } })
|
||||||
end)
|
end)
|
||||||
local ns = api.nvim_create_namespace('hlyank')
|
local ns = api.nvim_create_namespace('nvim.hlyank')
|
||||||
local win = api.nvim_get_current_win()
|
local win = api.nvim_get_current_win()
|
||||||
eq({ win }, api.nvim__ns_get(ns).wins)
|
eq({ win }, api.nvim__ns_get(ns).wins)
|
||||||
command('wincmd w')
|
command('wincmd w')
|
||||||
@@ -158,7 +158,7 @@ describe('vim.hl.on_yank', function()
|
|||||||
vim.api.nvim_buf_set_mark(0, ']', 1, 1, {})
|
vim.api.nvim_buf_set_mark(0, ']', 1, 1, {})
|
||||||
vim.hl.on_yank({ timeout = math.huge, on_macro = true, event = { operator = 'y' } })
|
vim.hl.on_yank({ timeout = math.huge, on_macro = true, event = { operator = 'y' } })
|
||||||
end)
|
end)
|
||||||
local ns = api.nvim_create_namespace('hlyank')
|
local ns = api.nvim_create_namespace('nvim.hlyank')
|
||||||
eq(api.nvim_get_current_win(), api.nvim__ns_get(ns).wins[1])
|
eq(api.nvim_get_current_win(), api.nvim__ns_get(ns).wins[1])
|
||||||
command('wincmd w')
|
command('wincmd w')
|
||||||
exec_lua(function()
|
exec_lua(function()
|
||||||
|
|||||||
Reference in New Issue
Block a user