mirror of
https://github.com/LunarVim/LunarVim.git
synced 2025-08-30 22:59:22 +02:00
fix styling issues (#811)
This commit is contained in:
Abouzar Parvan
GitHub
parent
a9e7b6ff8c
commit
2866ba528c
11 changed files with 170 additions and 176 deletions
215
lua/lsp/init.lua
215
lua/lsp/init.lua
|
|
@ -1,85 +1,79 @@
|
|||
-- TODO figure out why this don't work
|
||||
vim.fn.sign_define(
|
||||
"LspDiagnosticsSignError",
|
||||
{texthl = "LspDiagnosticsSignError", text = "", numhl = "LspDiagnosticsSignError"}
|
||||
"LspDiagnosticsSignError",
|
||||
{ texthl = "LspDiagnosticsSignError", text = "", numhl = "LspDiagnosticsSignError" }
|
||||
)
|
||||
vim.fn.sign_define(
|
||||
"LspDiagnosticsSignWarning",
|
||||
{texthl = "LspDiagnosticsSignWarning", text = "", numhl = "LspDiagnosticsSignWarning"}
|
||||
"LspDiagnosticsSignWarning",
|
||||
{ texthl = "LspDiagnosticsSignWarning", text = "", numhl = "LspDiagnosticsSignWarning" }
|
||||
)
|
||||
vim.fn.sign_define(
|
||||
"LspDiagnosticsSignHint",
|
||||
{texthl = "LspDiagnosticsSignHint", text = "", numhl = "LspDiagnosticsSignHint"}
|
||||
"LspDiagnosticsSignHint",
|
||||
{ texthl = "LspDiagnosticsSignHint", text = "", numhl = "LspDiagnosticsSignHint" }
|
||||
)
|
||||
vim.fn.sign_define(
|
||||
"LspDiagnosticsSignInformation",
|
||||
{texthl = "LspDiagnosticsSignInformation", text = "", numhl = "LspDiagnosticsSignInformation"}
|
||||
"LspDiagnosticsSignInformation",
|
||||
{ texthl = "LspDiagnosticsSignInformation", text = "", numhl = "LspDiagnosticsSignInformation" }
|
||||
)
|
||||
|
||||
vim.cmd("nnoremap <silent> gd <cmd>lua vim.lsp.buf.definition()<CR>")
|
||||
vim.cmd("nnoremap <silent> gD <cmd>lua vim.lsp.buf.declaration()<CR>")
|
||||
vim.cmd("nnoremap <silent> gr <cmd>lua vim.lsp.buf.references()<CR>")
|
||||
vim.cmd("nnoremap <silent> gi <cmd>lua vim.lsp.buf.implementation()<CR>")
|
||||
vim.cmd("nnoremap <silent> K :lua vim.lsp.buf.hover()<CR>")
|
||||
vim.cmd "nnoremap <silent> gd <cmd>lua vim.lsp.buf.definition()<CR>"
|
||||
vim.cmd "nnoremap <silent> gD <cmd>lua vim.lsp.buf.declaration()<CR>"
|
||||
vim.cmd "nnoremap <silent> gr <cmd>lua vim.lsp.buf.references()<CR>"
|
||||
vim.cmd "nnoremap <silent> gi <cmd>lua vim.lsp.buf.implementation()<CR>"
|
||||
vim.cmd "nnoremap <silent> K :lua vim.lsp.buf.hover()<CR>"
|
||||
-- vim.cmd('nnoremap <silent> <C-k> <cmd>lua vim.lsp.buf.signature_help()<CR>')
|
||||
vim.cmd("nnoremap <silent> <C-p> :lua vim.lsp.diagnostic.goto_prev({popup_opts = {border = O.lsp.popup_border}})<CR>")
|
||||
vim.cmd("nnoremap <silent> <C-n> :lua vim.lsp.diagnostic.goto_next({popup_opts = {border = O.lsp.popup_border}})<CR>")
|
||||
vim.cmd "nnoremap <silent> <C-p> :lua vim.lsp.diagnostic.goto_prev({popup_opts = {border = O.lsp.popup_border}})<CR>"
|
||||
vim.cmd "nnoremap <silent> <C-n> :lua vim.lsp.diagnostic.goto_next({popup_opts = {border = O.lsp.popup_border}})<CR>"
|
||||
-- scroll down hover doc or scroll in definition preview
|
||||
-- scroll up hover doc
|
||||
vim.cmd('command! -nargs=0 LspVirtualTextToggle lua require("lsp/virtual_text").toggle()')
|
||||
vim.cmd 'command! -nargs=0 LspVirtualTextToggle lua require("lsp/virtual_text").toggle()'
|
||||
|
||||
-- Set Default Prefix.
|
||||
-- Note: You can set a prefix per lsp server in the lv-globals.lua file
|
||||
vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
|
||||
vim.lsp.diagnostic.on_publish_diagnostics, {
|
||||
virtual_text = {
|
||||
prefix = "",
|
||||
spacing = 0,
|
||||
},
|
||||
signs = true,
|
||||
underline = true,
|
||||
}
|
||||
)
|
||||
vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
|
||||
virtual_text = {
|
||||
prefix = "",
|
||||
spacing = 0,
|
||||
},
|
||||
signs = true,
|
||||
underline = true,
|
||||
})
|
||||
|
||||
vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(
|
||||
vim.lsp.handlers.hover, {
|
||||
border = O.lsp.popup_border
|
||||
}
|
||||
)
|
||||
vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, {
|
||||
border = O.lsp.popup_border,
|
||||
})
|
||||
|
||||
vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(
|
||||
vim.lsp.handlers.signature_help, {
|
||||
border = O.lsp.popup_border
|
||||
}
|
||||
)
|
||||
vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, {
|
||||
border = O.lsp.popup_border,
|
||||
})
|
||||
|
||||
-- symbols for autocomplete
|
||||
vim.lsp.protocol.CompletionItemKind = {
|
||||
" (Text) ",
|
||||
" (Method)",
|
||||
" (Function)",
|
||||
" (Constructor)",
|
||||
" ﴲ (Field)",
|
||||
"[] (Variable)",
|
||||
" (Class)",
|
||||
" ﰮ (Interface)",
|
||||
" (Module)",
|
||||
" 襁 (Property)",
|
||||
" (Unit)",
|
||||
" (Value)",
|
||||
" 練 (Enum)",
|
||||
" (Keyword)",
|
||||
" (Snippet)",
|
||||
" (Color)",
|
||||
" (File)",
|
||||
" (Reference)",
|
||||
" (Folder)",
|
||||
" (EnumMember)",
|
||||
" ﲀ (Constant)",
|
||||
" ﳤ (Struct)",
|
||||
" (Event)",
|
||||
" (Operator)",
|
||||
" (TypeParameter)"
|
||||
" (Text) ",
|
||||
" (Method)",
|
||||
" (Function)",
|
||||
" (Constructor)",
|
||||
" ﴲ (Field)",
|
||||
"[] (Variable)",
|
||||
" (Class)",
|
||||
" ﰮ (Interface)",
|
||||
" (Module)",
|
||||
" 襁 (Property)",
|
||||
" (Unit)",
|
||||
" (Value)",
|
||||
" 練 (Enum)",
|
||||
" (Keyword)",
|
||||
" (Snippet)",
|
||||
" (Color)",
|
||||
" (File)",
|
||||
" (Reference)",
|
||||
" (Folder)",
|
||||
" (EnumMember)",
|
||||
" ﲀ (Constant)",
|
||||
" ﳤ (Struct)",
|
||||
" (Event)",
|
||||
" (Operator)",
|
||||
" (TypeParameter)",
|
||||
}
|
||||
|
||||
--[[ " autoformat
|
||||
|
|
@ -90,10 +84,10 @@ autocmd BufWritePre *.lua lua vim.lsp.buf.formatting_sync(nil, 100) ]]
|
|||
-- autocmd FileType java nnoremap ca <Cmd>lua require('jdtls').code_action()<CR>
|
||||
|
||||
local function documentHighlight(client, bufnr)
|
||||
-- Set autocommands conditional on server_capabilities
|
||||
if client.resolved_capabilities.document_highlight then
|
||||
vim.api.nvim_exec(
|
||||
[[
|
||||
-- Set autocommands conditional on server_capabilities
|
||||
if client.resolved_capabilities.document_highlight then
|
||||
vim.api.nvim_exec(
|
||||
[[
|
||||
hi LspReferenceRead cterm=bold ctermbg=red guibg=#464646
|
||||
hi LspReferenceText cterm=bold ctermbg=red guibg=#464646
|
||||
hi LspReferenceWrite cterm=bold ctermbg=red guibg=#464646
|
||||
|
|
@ -103,69 +97,68 @@ local function documentHighlight(client, bufnr)
|
|||
autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references()
|
||||
augroup END
|
||||
]],
|
||||
false
|
||||
)
|
||||
end
|
||||
false
|
||||
)
|
||||
end
|
||||
end
|
||||
local lsp_config = {}
|
||||
|
||||
if O.document_highlight then
|
||||
function lsp_config.common_on_attach(client, bufnr)
|
||||
documentHighlight(client, bufnr)
|
||||
end
|
||||
function lsp_config.common_on_attach(client, bufnr)
|
||||
documentHighlight(client, bufnr)
|
||||
end
|
||||
end
|
||||
|
||||
function lsp_config.tsserver_on_attach(client, bufnr)
|
||||
-- lsp_config.common_on_attach(client, bufnr)
|
||||
client.resolved_capabilities.document_formatting = false
|
||||
-- lsp_config.common_on_attach(client, bufnr)
|
||||
client.resolved_capabilities.document_formatting = false
|
||||
|
||||
local ts_utils = require("nvim-lsp-ts-utils")
|
||||
local ts_utils = require "nvim-lsp-ts-utils"
|
||||
|
||||
-- defaults
|
||||
ts_utils.setup {
|
||||
debug = false,
|
||||
disable_commands = false,
|
||||
enable_import_on_completion = false,
|
||||
import_all_timeout = 5000, -- ms
|
||||
-- defaults
|
||||
ts_utils.setup {
|
||||
debug = false,
|
||||
disable_commands = false,
|
||||
enable_import_on_completion = false,
|
||||
import_all_timeout = 5000, -- ms
|
||||
|
||||
-- eslint
|
||||
eslint_enable_code_actions = true,
|
||||
eslint_enable_disable_comments = true,
|
||||
eslint_bin = O.lang.tsserver.linter,
|
||||
eslint_config_fallback = nil,
|
||||
eslint_enable_diagnostics = true,
|
||||
-- eslint
|
||||
eslint_enable_code_actions = true,
|
||||
eslint_enable_disable_comments = true,
|
||||
eslint_bin = O.lang.tsserver.linter,
|
||||
eslint_config_fallback = nil,
|
||||
eslint_enable_diagnostics = true,
|
||||
|
||||
-- formatting
|
||||
enable_formatting = O.lang.tsserver.autoformat,
|
||||
formatter = O.lang.tsserver.formatter,
|
||||
formatter_config_fallback = nil,
|
||||
-- formatting
|
||||
enable_formatting = O.lang.tsserver.autoformat,
|
||||
formatter = O.lang.tsserver.formatter,
|
||||
formatter_config_fallback = nil,
|
||||
|
||||
-- parentheses completion
|
||||
complete_parens = false,
|
||||
signature_help_in_parens = false,
|
||||
-- parentheses completion
|
||||
complete_parens = false,
|
||||
signature_help_in_parens = false,
|
||||
|
||||
-- update imports on file move
|
||||
update_imports_on_move = false,
|
||||
require_confirmation_on_move = false,
|
||||
watch_dir = nil,
|
||||
}
|
||||
-- update imports on file move
|
||||
update_imports_on_move = false,
|
||||
require_confirmation_on_move = false,
|
||||
watch_dir = nil,
|
||||
}
|
||||
|
||||
-- required to fix code action ranges
|
||||
ts_utils.setup_client(client)
|
||||
-- required to fix code action ranges
|
||||
ts_utils.setup_client(client)
|
||||
|
||||
-- TODO: keymap these?
|
||||
-- vim.api.nvim_buf_set_keymap(bufnr, "n", "gs", ":TSLspOrganize<CR>", {silent = true})
|
||||
-- vim.api.nvim_buf_set_keymap(bufnr, "n", "qq", ":TSLspFixCurrent<CR>", {silent = true})
|
||||
-- vim.api.nvim_buf_set_keymap(bufnr, "n", "gr", ":TSLspRenameFile<CR>", {silent = true})
|
||||
-- vim.api.nvim_buf_set_keymap(bufnr, "n", "gi", ":TSLspImportAll<CR>", {silent = true})
|
||||
-- TODO: keymap these?
|
||||
-- vim.api.nvim_buf_set_keymap(bufnr, "n", "gs", ":TSLspOrganize<CR>", {silent = true})
|
||||
-- vim.api.nvim_buf_set_keymap(bufnr, "n", "qq", ":TSLspFixCurrent<CR>", {silent = true})
|
||||
-- vim.api.nvim_buf_set_keymap(bufnr, "n", "gr", ":TSLspRenameFile<CR>", {silent = true})
|
||||
-- vim.api.nvim_buf_set_keymap(bufnr, "n", "gi", ":TSLspImportAll<CR>", {silent = true})
|
||||
end
|
||||
|
||||
|
||||
require('lv-utils').define_augroups({
|
||||
_general_lsp = {
|
||||
{'FileType', 'lspinfo', 'nnoremap <silent> <buffer> q :q<CR>'},
|
||||
}
|
||||
})
|
||||
require("lv-utils").define_augroups {
|
||||
_general_lsp = {
|
||||
{ "FileType", "lspinfo", "nnoremap <silent> <buffer> q :q<CR>" },
|
||||
},
|
||||
}
|
||||
|
||||
-- Use a loop to conveniently both setup defined servers
|
||||
-- and map buffer local keybindings when the language server attaches
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue