Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(diagnostic): remove useless highlight links #15683

Merged
merged 1 commit into from Sep 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 0 additions & 26 deletions runtime/lua/vim/lsp/diagnostic.lua
Expand Up @@ -446,14 +446,6 @@ end
---
---@deprecated Prefer |vim.diagnostic._set_signs()|
---
--- Sign characters can be customized with the following commands:
---
--- <pre>
--- sign define LspDiagnosticsSignError text=E texthl=LspDiagnosticsSignError linehl= numhl=
--- sign define LspDiagnosticsSignWarning text=W texthl=LspDiagnosticsSignWarning linehl= numhl=
--- sign define LspDiagnosticsSignInformation text=I texthl=LspDiagnosticsSignInformation linehl= numhl=
--- sign define LspDiagnosticsSignHint text=H texthl=LspDiagnosticsSignHint linehl= numhl=
--- </pre>
---@param diagnostics Diagnostic[]
---@param bufnr number The buffer number
---@param client_id number the client id
Expand All @@ -478,15 +470,6 @@ end
---
---@deprecated Prefer |vim.diagnostic._set_underline()|
---
--- Underline highlights can be customized by changing the following |:highlight| groups.
---
--- <pre>
--- LspDiagnosticsUnderlineError
--- LspDiagnosticsUnderlineWarning
--- LspDiagnosticsUnderlineInformation
--- LspDiagnosticsUnderlineHint
--- </pre>
---
---@param diagnostics Diagnostic[]
---@param bufnr number: The buffer number
---@param client_id number: The client id
Expand All @@ -506,15 +489,6 @@ end
---
---@deprecated Prefer |vim.diagnostic._set_virtual_text()|
---
--- Virtual text highlights can be customized by changing the following |:highlight| groups.
---
--- <pre>
--- LspDiagnosticsVirtualTextError
--- LspDiagnosticsVirtualTextWarning
--- LspDiagnosticsVirtualTextInformation
--- LspDiagnosticsVirtualTextHint
--- </pre>
---
---@param diagnostics Diagnostic[]
---@param bufnr number
---@param client_id number
Expand Down
22 changes: 0 additions & 22 deletions runtime/plugin/diagnostic.vim
Expand Up @@ -24,25 +24,3 @@ hi default link DiagnosticSignError DiagnosticError
hi default link DiagnosticSignWarn DiagnosticWarn
hi default link DiagnosticSignInfo DiagnosticInfo
hi default link DiagnosticSignHint DiagnosticHint

" Link LspDiagnostics for backward compatibility
hi default link LspDiagnosticsDefaultHint DiagnosticHint
hi default link LspDiagnosticsVirtualTextHint DiagnosticVirtualTextHint
hi default link LspDiagnosticsFloatingHint DiagnosticFloatingHint
hi default link LspDiagnosticsSignHint DiagnosticSignHint
hi default link LspDiagnosticsDefaultError DiagnosticError
hi default link LspDiagnosticsVirtualTextError DiagnosticVirtualTextError
hi default link LspDiagnosticsFloatingError DiagnosticFloatingError
hi default link LspDiagnosticsSignError DiagnosticSignError
hi default link LspDiagnosticsDefaultWarning DiagnosticWarn
hi default link LspDiagnosticsVirtualTextWarning DiagnosticVirtualTextWarn
hi default link LspDiagnosticsFloatingWarning DiagnosticFloatingWarn
hi default link LspDiagnosticsSignWarning DiagnosticSignWarn
hi default link LspDiagnosticsDefaultInformation DiagnosticInfo
hi default link LspDiagnosticsVirtualTextInformation DiagnosticVirtualTextInfo
hi default link LspDiagnosticsFloatingInformation DiagnosticFloatingInfo
hi default link LspDiagnosticsSignInformation DiagnosticSignInfo
hi default link LspDiagnosticsUnderlineError DiagnosticUnderlineError
hi default link LspDiagnosticsUnderlineWarning DiagnosticUnderlineWarn
hi default link LspDiagnosticsUnderlineInformation DiagnosticUnderlineInfo
hi default link LspDiagnosticsUnderlineHint DiagnosticUnderlineHint
28 changes: 0 additions & 28 deletions test/functional/plugin/lsp/diagnostic_spec.lua
@@ -1,6 +1,5 @@
local helpers = require('test.functional.helpers')(after_each)

local command = helpers.command
local clear = helpers.clear
local exec_lua = helpers.exec_lua
local eq = helpers.eq
Expand Down Expand Up @@ -945,31 +944,4 @@ describe('vim.lsp.diagnostic', function()
assert(loc_list[1].lnum < loc_list[2].lnum)
end)
end)

it('highlight groups', function()
command('runtime plugin/diagnostic.vim')
eq({
'LspDiagnosticsDefaultError',
'LspDiagnosticsDefaultHint',
'LspDiagnosticsDefaultInformation',
'LspDiagnosticsDefaultWarning',
'LspDiagnosticsFloatingError',
'LspDiagnosticsFloatingHint',
'LspDiagnosticsFloatingInformation',
'LspDiagnosticsFloatingWarning',
'LspDiagnosticsSignError',
'LspDiagnosticsSignHint',
'LspDiagnosticsSignInformation',
'LspDiagnosticsSignWarning',
'LspDiagnosticsUnderlineError',
'LspDiagnosticsUnderlineHint',
'LspDiagnosticsUnderlineInformation',
'LspDiagnosticsUnderlineWarning',
'LspDiagnosticsVirtualTextError',
'LspDiagnosticsVirtualTextHint',
'LspDiagnosticsVirtualTextInformation',
'LspDiagnosticsVirtualTextWarning',
}, exec_lua([[return vim.fn.getcompletion('Lsp', 'highlight')]]))
end)

end)