From 209c15c008251cd96f0d4ae6a4c797a1ccb1e9bd Mon Sep 17 00:00:00 2001
From: Toby Vincent <tobyv13@gmail.com>
Date: Sat, 19 Mar 2022 14:27:18 -0500
Subject: feat: nvim working mostly

---
 nvim/lua/plugins/lspconfig.lua | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'nvim/lua/plugins/lspconfig.lua')

diff --git a/nvim/lua/plugins/lspconfig.lua b/nvim/lua/plugins/lspconfig.lua
index c10e1dc..0635ee8 100644
--- a/nvim/lua/plugins/lspconfig.lua
+++ b/nvim/lua/plugins/lspconfig.lua
@@ -1,3 +1,8 @@
+local status_ok, lspconfig = pcall(require, "lspconfig")
+if not status_ok then
+	return
+end
+
 local capabilities = vim.lsp.protocol.make_client_capabilities()
 capabilities.textDocument.completion.completionItem.snippetSupport = true
 
@@ -9,7 +14,7 @@ vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
     virtual_text = {
         true,
         spacing = 6,
-        --severity_limit='Error'  -- Only show virtual text on error
+        severity_limit='Error'  -- Only show virtual text on error
     },
   }
 )
@@ -32,19 +37,11 @@ local function config(_config)
 	}, _config or {})
 end
 
-require("lspconfig").tsserver.setup(config())
-
-require("lspconfig").ccls.setup(config())
-
-require("lspconfig").jedi_language_server.setup(config())
+lspconfig.tsserver.setup(config())
 
-require("lspconfig").svelte.setup(config())
+lspconfig.ccls.setup(config())
 
-require("lspconfig").solang.setup(config())
-
-require("lspconfig").cssls.setup(config())
-
-require("lspconfig").gopls.setup(config({
+lspconfig.gopls.setup(config({
 	cmd = { "gopls", "serve" },
 	settings = {
 		gopls = {
@@ -72,8 +69,11 @@ local rustopts = {
     server = {
         settings = {
             ["rust-analyzer"] = {
+                cargo = {
+                    allFeatures = "true",
+                },
                 checkOnSave = {
-                    command = "clippy"
+                    command = "clippy",
                 },
             }
         }
-- 
cgit v1.2.3-70-g09d2