added rust and lsp status

This commit is contained in:
MasterGordon 2021-10-17 18:56:10 +02:00
parent e29721fd08
commit f18e06823f
6 changed files with 40 additions and 9 deletions

View File

@ -16,6 +16,7 @@ set.shiftwidth = 2
set.expandtab = true set.expandtab = true
vim.cmd [[autocmd FileType markdown setlocal spell spelllang=de,en]] vim.cmd [[autocmd FileType markdown setlocal spell spelllang=de,en]]
vim.cmd [[autocmd FileType tex setlocal spell spelllang=de,en]]
vim.cmd [[autocmd bufnewfile,bufread *.tsx set filetype=typescriptreact]] vim.cmd [[autocmd bufnewfile,bufread *.tsx set filetype=typescriptreact]]
vim.cmd [[autocmd bufnewfile,bufread *.jsx set filetype=javascriptreact]] vim.cmd [[autocmd bufnewfile,bufread *.jsx set filetype=javascriptreact]]
vim.cmd [[autocmd bufnewfile,bufread Jenkinsfile set filetype=groovy]] vim.cmd [[autocmd bufnewfile,bufread Jenkinsfile set filetype=groovy]]

View File

@ -156,7 +156,8 @@ return require("packer").startup(
"onsails/lspkind-nvim", "onsails/lspkind-nvim",
"ray-x/lsp_signature.nvim", "ray-x/lsp_signature.nvim",
"jose-elias-alvarez/nvim-lsp-ts-utils", "jose-elias-alvarez/nvim-lsp-ts-utils",
"jose-elias-alvarez/null-ls.nvim" "jose-elias-alvarez/null-ls.nvim",
"nvim-lua/lsp-status.nvim"
} }
} }
use { use {

View File

@ -4,6 +4,11 @@ local npairs = require("nvim-autopairs")
npairs.setup({map_bs = false}) npairs.setup({map_bs = false})
vim.g.coq_settings = { vim.g.coq_settings = {
clients = {
lsp = {
weight_adjust = 10
}
},
keymap = {recommended = false, manual_complete = "<c-f>"}, keymap = {recommended = false, manual_complete = "<c-f>"},
display = { display = {
preview = { preview = {

View File

@ -140,6 +140,18 @@ gls.left[12] = {
} }
} }
gls.right[0] = {
LeftEnd = {
provider = function()
return require("lsp-status").status()
end,
condition = condition.hide_in_width,
separator = " ",
separator_highlight = {"NONE", colors.bg},
highlight = {"NONE", colors.bg}
}
}
gls.right[1] = { gls.right[1] = {
FileEncode = { FileEncode = {
provider = "FileEncode", provider = "FileEncode",

View File

@ -21,6 +21,12 @@ signHint["texthl"] = "DiagnosticSignHint"
vim.fn.sign_define("DiagnosticSignHint", signHint) vim.fn.sign_define("DiagnosticSignHint", signHint)
vim.fn.sign_define("DiagnosticSignInfo", signHint) vim.fn.sign_define("DiagnosticSignInfo", signHint)
-- Lsp Status
local lsp_status = require("lsp-status")
-- Register the progress handler
lsp_status.register_progress()
--- Completion Icons --- Completion Icons
require("lspkind").init({}) require("lspkind").init({})
@ -31,7 +37,6 @@ require "lspconfig".clangd.setup {}
require "lspconfig".cssls.setup {} require "lspconfig".cssls.setup {}
require "lspconfig".html.setup {} require "lspconfig".html.setup {}
require "lspconfig".pyright.setup {} require "lspconfig".pyright.setup {}
require "lspconfig".tsserver.setup {}
require "lspconfig".vimls.setup {} require "lspconfig".vimls.setup {}
require "lspconfig".yamlls.setup {} require "lspconfig".yamlls.setup {}
require "lspconfig".texlab.setup {} require "lspconfig".texlab.setup {}
@ -97,6 +102,7 @@ local on_attach = function(client, bufnr)
buf_set_keymap("n", "[d", "<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>", opts) buf_set_keymap("n", "[d", "<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>", opts)
buf_set_keymap("n", "]d", "<cmd>lua vim.lsp.diagnostic.goto_next()<CR>", opts) buf_set_keymap("n", "]d", "<cmd>lua vim.lsp.diagnostic.goto_next()<CR>", opts)
buf_set_keymap("n", "<space>q", "<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>", opts) buf_set_keymap("n", "<space>q", "<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>", opts)
lsp_status.on_attach(client, bufnr)
end end
require "lspconfig".jsonls.setup { require "lspconfig".jsonls.setup {
@ -106,7 +112,8 @@ require "lspconfig".jsonls.setup {
}, },
settings = { settings = {
json = require "json-schema" json = require "json-schema"
} },
capabilities = lsp_status.capabilities
} }
require "lspconfig".tsserver.setup { require "lspconfig".tsserver.setup {
@ -122,19 +129,21 @@ require "lspconfig".tsserver.setup {
end, end,
flags = { flags = {
debounce_text_changes = 150 debounce_text_changes = 150
} },
capabilities = lsp_status.capabilities
} }
--[[ require "lspconfig".java_language_server.setup { --[[ require "lspconfig".java_language_server.setup {
on_attach = on_attach, on_attach = on_attach,
cmd = {"java-language-server"} cmd = {"java-language-server"}
} ]] } ]]
local servers = {"pyright", "bashls", "clangd", "cssls", "texlab"} local servers = {"pyright", "bashls", "clangd", "cssls", "texlab", "rust_analyzer"}
for _, lsp in ipairs(servers) do for _, lsp in ipairs(servers) do
nvim_lsp[lsp].setup { nvim_lsp[lsp].setup {
on_attach = on_attach, on_attach = on_attach,
flags = { flags = {
debounce_text_changes = 150 debounce_text_changes = 150
} },
capabilities = lsp_status.capabilities
} }
end end

View File

@ -2,12 +2,15 @@ vim.cmd([[let test#javascript#reactscripts#options = "--watchAll=false"]])
vim.cmd([[let test#javascriptreact#reactscripts#options = "--watchAll=false"]]) vim.cmd([[let test#javascriptreact#reactscripts#options = "--watchAll=false"]])
vim.cmd([[let test#typescript#reactscripts#options = "--watchAll=false"]]) vim.cmd([[let test#typescript#reactscripts#options = "--watchAll=false"]])
vim.cmd([[let test#typescriptreact#reactscripts#options = "--watchAll=false"]]) vim.cmd([[let test#typescriptreact#reactscripts#options = "--watchAll=false"]])
vim.cmd([[ vim.cmd(
[[
augroup UltestRunner augroup UltestRunner
au! au!
au BufWritePost * UltestNearest au BufWritePost *.test.* UltestNearest
au BufWritePost *.spec.* UltestNearest
augroup END augroup END
]]) ]]
)
vim.g.ultest_virtual_text = 1 vim.g.ultest_virtual_text = 1
vim.g.ultest_output_on_run = 0 vim.g.ultest_output_on_run = 0
vim.g.ultest_pass_text = "🎉" vim.g.ultest_pass_text = "🎉"