mirror of
https://github.com/neovim/neovim.git
synced 2025-10-26 12:27:24 +00:00
refactor: rename vim.highlight => vim.hl
Problem: - `vim.highlight` module does not follow `:help dev-name-common`, which documents the name for "highlight" as "hl". - Shorter names are usually preferred. Solution: Rename `vim.highlight` to `vim.hl`. This is not a breaking change until 2.0 (or maybe never).
This commit is contained in:
@@ -32,7 +32,7 @@ for k, v in pairs({
|
||||
func = true,
|
||||
F = true,
|
||||
lsp = true,
|
||||
highlight = true,
|
||||
hl = true,
|
||||
diagnostic = true,
|
||||
keymap = true,
|
||||
ui = true,
|
||||
@@ -1197,4 +1197,7 @@ require('vim._options')
|
||||
---@deprecated
|
||||
vim.loop = vim.uv
|
||||
|
||||
-- Deprecated. Remove at Nvim 2.0
|
||||
vim.highlight = vim._defer_deprecated_module('vim.highlight', 'vim.hl')
|
||||
|
||||
return vim
|
||||
|
||||
@@ -15,7 +15,7 @@ vim.fs = require('vim.fs')
|
||||
vim.func = require('vim.func')
|
||||
vim.glob = require('vim.glob')
|
||||
vim.health = require('vim.health')
|
||||
vim.highlight = require('vim.highlight')
|
||||
vim.hl = require('vim.hl')
|
||||
vim.iter = require('vim.iter')
|
||||
vim.keymap = require('vim.keymap')
|
||||
vim.loader = require('vim.loader')
|
||||
|
||||
@@ -1498,13 +1498,13 @@ M.handlers.underline = {
|
||||
end
|
||||
end
|
||||
|
||||
vim.highlight.range(
|
||||
vim.hl.range(
|
||||
bufnr,
|
||||
underline_ns,
|
||||
higroup,
|
||||
{ diagnostic.lnum, diagnostic.col },
|
||||
{ diagnostic.end_lnum, diagnostic.end_col },
|
||||
{ priority = vim.highlight.priorities.diagnostics }
|
||||
{ priority = vim.hl.priorities.diagnostics }
|
||||
)
|
||||
end
|
||||
save_extmarks(underline_ns, bufnr)
|
||||
|
||||
@@ -17,7 +17,7 @@ M.priorities = {
|
||||
user = 200,
|
||||
}
|
||||
|
||||
--- @class vim.highlight.range.Opts
|
||||
--- @class vim.hl.range.Opts
|
||||
--- @inlinedoc
|
||||
---
|
||||
--- Type of range. See [getregtype()]
|
||||
@@ -28,8 +28,8 @@ M.priorities = {
|
||||
--- (default: `false`)
|
||||
--- @field inclusive? boolean
|
||||
---
|
||||
--- Indicates priority of highlight
|
||||
--- (default: `vim.highlight.priorities.user`)
|
||||
--- Highlight priority
|
||||
--- (default: `vim.hl.priorities.user`)
|
||||
--- @field priority? integer
|
||||
|
||||
--- Apply highlight group to range of text.
|
||||
@@ -39,7 +39,7 @@ M.priorities = {
|
||||
---@param higroup string Highlight group to use for highlighting
|
||||
---@param start integer[]|string Start of region as a (line, column) tuple or string accepted by |getpos()|
|
||||
---@param finish integer[]|string End of region as a (line, column) tuple or string accepted by |getpos()|
|
||||
---@param opts? vim.highlight.range.Opts
|
||||
---@param opts? vim.hl.range.Opts
|
||||
function M.range(bufnr, ns, higroup, start, finish, opts)
|
||||
opts = opts or {}
|
||||
local regtype = opts.regtype or 'v'
|
||||
@@ -124,7 +124,7 @@ local yank_cancel --- @type fun()?
|
||||
--- Add the following to your `init.vim`:
|
||||
---
|
||||
--- ```vim
|
||||
--- autocmd TextYankPost * silent! lua vim.highlight.on_yank {higroup='Visual', timeout=300}
|
||||
--- autocmd TextYankPost * silent! lua vim.hl.on_yank {higroup='Visual', timeout=300}
|
||||
--- ```
|
||||
---
|
||||
--- @param opts table|nil Optional parameters
|
||||
@@ -133,7 +133,7 @@ local yank_cancel --- @type fun()?
|
||||
--- - on_macro highlight when executing macro (default false)
|
||||
--- - on_visual highlight when yanking visual selection (default true)
|
||||
--- - event event structure (default vim.v.event)
|
||||
--- - priority integer priority (default |vim.highlight.priorities|`.user`)
|
||||
--- - priority integer priority (default |vim.hl.priorities|`.user`)
|
||||
function M.on_yank(opts)
|
||||
vim.validate({
|
||||
opts = {
|
||||
@@ -145,7 +145,7 @@ function M.on_yank(opts)
|
||||
return type(t) == 'table'
|
||||
end
|
||||
end,
|
||||
'a table or nil to configure options (see `:h highlight.on_yank`)',
|
||||
'a table or nil to configure options (see `:h vim.hl.on_yank`)',
|
||||
},
|
||||
})
|
||||
opts = opts or {}
|
||||
@@ -437,7 +437,7 @@ function M.signature_help(_, result, ctx, config)
|
||||
local fbuf, fwin = util.open_floating_preview(lines, 'markdown', config)
|
||||
-- Highlight the active parameter.
|
||||
if hl then
|
||||
vim.highlight.range(
|
||||
vim.hl.range(
|
||||
fbuf,
|
||||
sig_help_ns,
|
||||
'LspSignatureActiveParameter',
|
||||
|
||||
@@ -443,7 +443,7 @@ function STHighlighter:on_win(topline, botline)
|
||||
vim.api.nvim_buf_set_extmark(self.bufnr, state.namespace, token.line, token.start_col, {
|
||||
hl_group = hl_group,
|
||||
end_col = token.end_col,
|
||||
priority = vim.highlight.priorities.semantic_tokens + delta,
|
||||
priority = vim.hl.priorities.semantic_tokens + delta,
|
||||
strict = false,
|
||||
})
|
||||
end
|
||||
@@ -723,7 +723,7 @@ end
|
||||
--- @inlinedoc
|
||||
---
|
||||
--- Priority for the applied extmark.
|
||||
--- (Default: `vim.highlight.priorities.semantic_tokens + 3`)
|
||||
--- (Default: `vim.hl.priorities.semantic_tokens + 3`)
|
||||
--- @field priority? integer
|
||||
|
||||
--- Highlight a semantic token.
|
||||
@@ -752,7 +752,7 @@ function M.highlight_token(token, bufnr, client_id, hl_group, opts)
|
||||
end
|
||||
|
||||
opts = opts or {}
|
||||
local priority = opts.priority or vim.highlight.priorities.semantic_tokens + 3
|
||||
local priority = opts.priority or vim.hl.priorities.semantic_tokens + 3
|
||||
|
||||
vim.api.nvim_buf_set_extmark(bufnr, state.namespace, token.line, token.start_col, {
|
||||
hl_group = hl_group,
|
||||
|
||||
@@ -2,7 +2,6 @@ local protocol = require('vim.lsp.protocol')
|
||||
local validate = vim.validate
|
||||
local api = vim.api
|
||||
local list_extend = vim.list_extend
|
||||
local highlight = vim.highlight
|
||||
local uv = vim.uv
|
||||
|
||||
local M = {}
|
||||
@@ -1716,13 +1715,13 @@ do --[[ References ]]
|
||||
[protocol.DocumentHighlightKind.Write] = 'LspReferenceWrite',
|
||||
}
|
||||
local kind = reference['kind'] or protocol.DocumentHighlightKind.Text
|
||||
highlight.range(
|
||||
vim.hl.range(
|
||||
bufnr,
|
||||
reference_ns,
|
||||
document_highlight_kind[kind],
|
||||
{ start_line, start_idx },
|
||||
{ end_line, end_idx },
|
||||
{ priority = vim.highlight.priorities.user }
|
||||
{ priority = vim.hl.priorities.user }
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -328,7 +328,7 @@ local function on_line_impl(self, buf, line, is_spell_nav)
|
||||
-- The "priority" attribute can be set at the pattern level or on a particular capture
|
||||
local priority = (
|
||||
tonumber(metadata.priority or metadata[capture] and metadata[capture].priority)
|
||||
or vim.highlight.priorities.treesitter
|
||||
or vim.hl.priorities.treesitter
|
||||
) + spell_pri_offset
|
||||
|
||||
-- The "conceal" attribute can be set at the pattern level or on a particular capture
|
||||
|
||||
Reference in New Issue
Block a user