From f18e06823fba30a096144ef7f7af7565d23d5a30 Mon Sep 17 00:00:00 2001
From: MasterGordon <gologo.x@gmail.com>
Date: Sun, 17 Oct 2021 18:56:10 +0200
Subject: [PATCH] added rust and lsp status

---
 lua/basics.lua             |  1 +
 lua/plugins.lua            |  3 ++-
 lua/plugins/coq.lua        |  5 +++++
 lua/plugins/galaxyline.lua | 12 ++++++++++++
 lua/plugins/lsp.lua        | 19 ++++++++++++++-----
 lua/plugins/ultest.lua     |  9 ++++++---
 6 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/lua/basics.lua b/lua/basics.lua
index 4dd40fa..cd545ef 100644
--- a/lua/basics.lua
+++ b/lua/basics.lua
@@ -16,6 +16,7 @@ set.shiftwidth = 2
 set.expandtab = true
 
 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 *.jsx set filetype=javascriptreact]]
 vim.cmd [[autocmd bufnewfile,bufread Jenkinsfile set filetype=groovy]]
diff --git a/lua/plugins.lua b/lua/plugins.lua
index 39dc872..147ed43 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -156,7 +156,8 @@ return require("packer").startup(
         "onsails/lspkind-nvim",
         "ray-x/lsp_signature.nvim",
         "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 {
diff --git a/lua/plugins/coq.lua b/lua/plugins/coq.lua
index 6e6a6d8..08b536e 100644
--- a/lua/plugins/coq.lua
+++ b/lua/plugins/coq.lua
@@ -4,6 +4,11 @@ local npairs = require("nvim-autopairs")
 npairs.setup({map_bs = false})
 
 vim.g.coq_settings = {
+  clients = {
+    lsp = {
+      weight_adjust = 10
+    }
+  },
   keymap = {recommended = false, manual_complete = "<c-f>"},
   display = {
     preview = {
diff --git a/lua/plugins/galaxyline.lua b/lua/plugins/galaxyline.lua
index 324a154..cecafb7 100644
--- a/lua/plugins/galaxyline.lua
+++ b/lua/plugins/galaxyline.lua
@@ -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] = {
   FileEncode = {
     provider = "FileEncode",
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index e2b0c3f..6892e4c 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -21,6 +21,12 @@ signHint["texthl"] = "DiagnosticSignHint"
 vim.fn.sign_define("DiagnosticSignHint", 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
 require("lspkind").init({})
 
@@ -31,7 +37,6 @@ require "lspconfig".clangd.setup {}
 require "lspconfig".cssls.setup {}
 require "lspconfig".html.setup {}
 require "lspconfig".pyright.setup {}
-require "lspconfig".tsserver.setup {}
 require "lspconfig".vimls.setup {}
 require "lspconfig".yamlls.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_next()<CR>", opts)
   buf_set_keymap("n", "<space>q", "<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>", opts)
+  lsp_status.on_attach(client, bufnr)
 end
 
 require "lspconfig".jsonls.setup {
@@ -106,7 +112,8 @@ require "lspconfig".jsonls.setup {
   },
   settings = {
     json = require "json-schema"
-  }
+  },
+  capabilities = lsp_status.capabilities
 }
 
 require "lspconfig".tsserver.setup {
@@ -122,19 +129,21 @@ require "lspconfig".tsserver.setup {
   end,
   flags = {
     debounce_text_changes = 150
-  }
+  },
+  capabilities = lsp_status.capabilities
 }
 
 --[[ require "lspconfig".java_language_server.setup {
   on_attach = on_attach,
   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
   nvim_lsp[lsp].setup {
     on_attach = on_attach,
     flags = {
       debounce_text_changes = 150
-    }
+    },
+    capabilities = lsp_status.capabilities
   }
 end
diff --git a/lua/plugins/ultest.lua b/lua/plugins/ultest.lua
index abb00f5..84d088e 100644
--- a/lua/plugins/ultest.lua
+++ b/lua/plugins/ultest.lua
@@ -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#typescript#reactscripts#options = "--watchAll=false"]])
 vim.cmd([[let test#typescriptreact#reactscripts#options = "--watchAll=false"]])
-vim.cmd([[
+vim.cmd(
+  [[
 augroup UltestRunner
     au!
-    au BufWritePost * UltestNearest
+    au BufWritePost *.test.* UltestNearest
+    au BufWritePost *.spec.* UltestNearest
 augroup END
-]])
+]]
+)
 vim.g.ultest_virtual_text = 1
 vim.g.ultest_output_on_run = 0
 vim.g.ultest_pass_text = "🎉"