Skip to content

Commit

Permalink
remove diagnostic-nvim
Browse files Browse the repository at this point in the history
nvim-lua/diagnostic.nvim is deprecated.
[migration
guide](nvim-lua/diagnostic-nvim#73)
  • Loading branch information
zhaozg committed Nov 14, 2020
1 parent 2a2209d commit b8eb1bb
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 52 deletions.
5 changes: 0 additions & 5 deletions layers/Enhance/lsp/init.vim
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
let g:diagnostic_enable_virtual_text = 1
let g:diagnostic_virtual_text_prefix = ''
let g:diagnostic_insert_delay = 1
let g:space_before_virtual_text = 5

let g:neospace.lsp_enable = get(g:, "neospace.lsp_enable", {
\ 'lua': 1,
\ 'sh': 1,
Expand Down
1 change: 0 additions & 1 deletion layers/Enhance/lsp/packages.vim
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
MP 'neovim/nvim-lspconfig'
MP 'nvim-lua/diagnostic-nvim'
MP 'nvim-lua/lsp-status.nvim'
46 changes: 0 additions & 46 deletions lua/neospace/lsp.lua
Original file line number Diff line number Diff line change
@@ -1,54 +1,8 @@
local nvim = require'nvim'
local vim = nvim.vim
local api = vim.api

local nvim_lsp = require('nvim_lsp')

local on_attach = function(client, bufnr)
bufnr = bufnr or 0

local resolved_capabilities = client.resolved_capabilities

-- Mappings.
local opts = {noremap = true, silent = true}
api.nvim_buf_set_keymap(bufnr, "n", "gD",
"<Cmd>lua show_diagnostics_details()<CR>", opts)
api.nvim_buf_set_keymap(bufnr, "n", "gd",
"<Cmd>lua vim.lsp.buf.definition()<CR>", opts)
api.nvim_buf_set_keymap(bufnr, "n", "gi",
"<Cmd>lua vim.lsp.buf.implementation()<CR>", opts)
api.nvim_buf_set_keymap(bufnr, "n", "gK", "<Cmd>lua vim.lsp.buf.hover()<CR>",
opts)
api.nvim_buf_set_keymap(bufnr, "n", "gh",
"<Cmd>lua vim.lsp.buf.signature_help()<CR>", opts)
api.nvim_buf_set_keymap(bufnr, "n", "gr",
"<Cmd>lua vim.lsp.buf.references()<CR>", opts)
api.nvim_buf_set_keymap(bufnr, "n", "gF",
"<Cmd>lua vim.lsp.buf.formatting()<CR>", opts)
api.nvim_buf_set_keymap(bufnr, "n", "ga",
"<Cmd>lua request_code_actions()<CR>", opts)
api.nvim_buf_set_keymap(bufnr, 'n', '<leader>gD',
'<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
api.nvim_buf_set_keymap(bufnr, 'n', '<leader>gR',
'<cmd>lua vim.lsp.buf.rename()<CR>', opts)
api.nvim_buf_set_keymap(bufnr, 'n', '<leader>e',
'<cmd>lua vim.lsp.util.show_line_diagnostics()<CR>',
opts)
if resolved_capabilities.document_highlight then
api.nvim_command [[autocmd CursorHold <buffer> lua vim.lsp.buf.document_highlight()]]
api.nvim_command [[autocmd CursorHoldI <buffer> lua vim.lsp.buf.document_highlight()]]
end
api.nvim_command [[autocmd CursorMoved <buffer> lua vim.lsp.util.buf_clear_references()]]

require'diagnostic'.on_attach(client, bufnr)
end

local M = {}

M.on_attach = on_attach

M.setup = function(name, opts)
opts.on_attach = opts.on_attach or on_attach
nvim_lsp[name].setup(opts)
end

Expand Down

0 comments on commit b8eb1bb

Please sign in to comment.