Lsp changes (deprecations etc)

lua/custom/lspconfig.lua

@@ -13,26 +13,14 @@ end
 local keymap = vim.keymap -- for conciseness
 
 ---------- border >------------------------------
-local _border = "single"
+local orig_floating_preview = vim.lsp.util.open_floating_preview
-require('lspconfig.ui.windows').default_options = {
+vim.lsp.util.open_floating_preview = function(contents, syntax, opts, ...)
-	border = _border
+    opts = opts or {}
-}
+    opts.border = "rounded" -- You can also use "single", "double", or "shadow"
-vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(
+    return orig_floating_preview(contents, syntax, opts, ...)
-	vim.lsp.handlers.hover, {
+end
-		border = _border
-	}
-)
-
-vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(
-	vim.lsp.handlers.signature_help, {
-		border = _border
-	}
-)
-
-vim.diagnostic.config {
-	float = { border = _border }
-}
 ---------- </border ------------------------------
+vim.diagnostic.config({ virtual_lines = { current_line = true } })
 
 -- enable keybinds only for when lsp server available
 local on_attach = function(_, bufnr)
@@ -40,8 +28,7 @@ local on_attach = function(_, bufnr)
     local opts = { noremap = true, silent = true, buffer = bufnr }
 
     keymap.set("n", "g0", "<cmd>lua vim.lsp.buf.document_symbol()<CR>", opts)
-	-- keymap.set("n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", opts)
+    -- keymap.set("n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", opts) keymap.set("n", "gD", "<cmd>lua vim.lsp.buf.declaration()<CR>", opts)    -- got to declaration
-	keymap.set("n", "gD", "<cmd>lua vim.lsp.buf.declaration()<CR>", opts) -- got to declaration
     keymap.set("n", "gd", "<cmd>lua vim.lsp.buf.definition()<CR>", opts)     -- see definition and make edits in window
     keymap.set("n", "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>", opts) -- go to implementation
     keymap.set("n", "<leader>l", "<cmd>lua vim.lsp.buf.format()<CR>", opts)  -- format code
@@ -83,19 +70,6 @@ end
 -- used to enable autocompletion (assign to every lsp server config)
 local capabilities = cmp_nvim_lsp.default_capabilities()
 
--- Change the Diagnostic symbols in the sign column (gutter)
--- (not in youtube nvim video)
-local signs = { Error = " ", Warn = " ", Hint = "󰋽 ", Info = " " }
-for type, icon in pairs(signs) do
-	local hl = "DiagnosticSign" .. type
-	vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
-end
-
-local lsp_flags = {
-	-- This is the default in Nvim 0.7+
-	debounce_text_changes = 150,
-}
-
 lspconfig["bashls"].setup({
     capabilities = capabilities,
     on_attach = on_attach,
@@ -124,7 +98,6 @@ lspconfig["jsonls"].setup({
 
 lspconfig["pyright"].setup({
     on_attach = on_attach,
-	flags = lsp_flags,
     filetypes = { "py" },
 })
 
@@ -166,7 +139,6 @@ lspconfig["eslint"].setup({
 lspconfig["rust_analyzer"].setup({
     on_attach = on_attach,
     capabilities = capabilities,
-	flags = lsp_flags,
     -- Server-specific settings...
     settings = {
         ["rust-analyzer"] = {
@@ -188,21 +160,6 @@ lspconfig["yamlls"].setup({
 lspconfig["lua_ls"].setup({
     capabilities = capabilities,
     on_attach = on_attach,
-	settings = { -- custom settings for lua
-		Lua = {
-			-- make the language server recognize "vim" global
-			diagnostics = {
-				globals = { "vim" },
-			},
-			workspace = {
-				-- make language server aware of runtime files
-				library = {
-					[vim.fn.expand("$VIMRUNTIME/lua")] = true,
-					[vim.fn.stdpath("config") .. "/lua"] = true,
-				},
-			},
-		},
-	},
     filetypes = { "lua" },
 })
 
@@ -230,4 +187,12 @@ lspconfig["slint_lsp"].setup({
 
 vim.g.nvim_phpcs_config_phpcs_path = 'phpcs'
 vim.g.nvim_phpcs_config_phpcbf_path = 'phpcbf'
-vim.g.nvim_phpcs_config_phpcs_standard = "/home/mace/repos/configs/phpcs.xml"
+local phpcs_config = "/home/mace/repos/configs/phpcs.xml"
+local phpcs_config_new = "/home/mace/repos/dotfiles/phpcs.xml"
+
+if vim.loop.fs_stat(phpcs_config_new) then
+    vim.g.nvim_phpcs_config_phpcs_standard = phpcs_config_new
+end
+if vim.loop.fs_stat(phpcs_config) then
+    vim.g.nvim_phpcs_config_phpcs_standard = phpcs_config
+end