some updates for 0.8, more to come

Author: tjdevries

xdg_config/nvim/.gdb_history

@@ -51,3 +51,6 @@ Group.new("TSTitle", c.blue)
 -- the text with characters or something like that...
 -- but we'll have to stick to that for later.
 Group.new("InjectedLanguage", nil, g.Normal.bg:dark())
+
+Group.new("LspParameter", nil, nil, s.italic)
+Group.new("LspDeprecated", nil, nil, s.strikethrough)

xdg_config/nvim/after/plugin/colorscheme.lua

@@ -26,10 +26,6 @@ require("Comment").setup {
     -- extra mapping
     -- Includes `gco`, `gcO`, `gcA`
     extra = true,
-
-    -- extended mapping
-    -- Includes `g>`, `g<`, `g>[count]{motion}` and `g<[count]{motion}`
-    extended = true,
   },
 
   -- LHS of toggle mapping in NORMAL + VISUAL mode

xdg_config/nvim/after/plugin/comments.lua

@@ -2,6 +2,10 @@ if not pcall(require, "plenary") then
   return
 end
 
+if pcall(require, "noice") then
+  return
+end
+
 local log = require("plenary.log").new {
   plugin = "notify",
   level = "debug",
@@ -10,6 +14,5 @@ local log = require("plenary.log").new {
 
 vim.notify = function(msg, level, opts)
   log.info(msg, level, opts)
-
   require "notify"(msg, level, opts)
 end

xdg_config/nvim/after/plugin/notify.lua

@@ -0,0 +1,18 @@
+local func = {}
+
+func.autocmd = function(args)
+  local event = args[1]
+  local group = args[2]
+  local callback = args[3]
+
+  vim.api.nvim_create_autocmd(event, {
+    group = group,
+    buffer = args[4],
+    callback = function()
+      callback()
+    end,
+    once = args.once,
+  })
+end
+
+return func

xdg_config/nvim/lua/tj/auto.lua

@@ -1,5 +1,3 @@
-local override = require "tj.lsp.override"
-
 -- Jump directly to the first available definition every time.
 vim.lsp.handlers["textDocument/definition"] = function(_, result)
   if not result or vim.tbl_isempty(result) then
@@ -80,13 +78,4 @@ vim.lsp.codelens.display = require("gl.codelens").display
 --     :run()
 -- end
 
--- override.set("workspace/executeCommand", function(err, result, ctx, config)
---   if vim.bo[ctx.bufnr].filetype ~= "go" then
---     return override.get(ctx.method)(err, result, ctx, config)
---   end
---
---   print("filetype:", vim.bo[ctx.bufnr].filetype)
---   P(ctx)
--- end)
-
 return M

xdg_config/nvim/lua/tj/lsp/extensions.lua

@@ -1,40 +1,34 @@
+local lspconfig = vim.F.npcall(require, "lspconfig")
+if not lspconfig then
+  return
+end
+
 local imap = require("tj.keymap").imap
 local nmap = require("tj.keymap").nmap
+local autocmd = require("tj.auto").autocmd
+local autocmd_clear = vim.api.nvim_clear_autocmds
 
-local has_lsp, lspconfig = pcall(require, "lspconfig")
-if not has_lsp then
-  return
-end
+local semantic = vim.F.npcall(require, "nvim-semantic-tokens")
 
 local is_mac = vim.fn.has "macunix" == 1
 
 local lspconfig_util = require "lspconfig.util"
 
-local ok, nvim_status = pcall(require, "lsp-status")
-if not ok then
-  nvim_status = nil
-end
-
 local telescope_mapper = require "tj.telescope.mappings"
 local handlers = require "tj.lsp.handlers"
 
 local ts_util = require "nvim-lsp-ts-utils"
 
--- Can set this lower if needed.
--- require("vim.lsp.log").set_level "debug"
--- require("vim.lsp.log").set_level "trace"
-
-local status = require "tj.lsp.status"
-if status then
-  status.activate()
-end
-
 local custom_init = function(client)
   client.config.flags = client.config.flags or {}
   client.config.flags.allow_incremental_sync = true
 end
 
-local augroup_format = vim.api.nvim_create_augroup("my_lsp_format", { clear = true })
+local augroup_highlight = vim.api.nvim_create_augroup("custom-lsp-references", { clear = true })
+local augroup_codelens = vim.api.nvim_create_augroup("custom-lsp-codelens", { clear = true })
+local augroup_format = vim.api.nvim_create_augroup("custom-lsp-format", { clear = true })
+local augroup_semantic = vim.api.nvim_create_augroup("custom-lsp-semantic", { clear = true })
+
 local autocmd_format = function(async, filter)
   vim.api.nvim_clear_autocmds { buffer = 0, group = augroup_format }
   vim.api.nvim_create_autocmd("BufWritePre", {
@@ -100,13 +94,9 @@ local buf_inoremap = function(opts)
   imap(opts)
 end
 
-local custom_attach = function(client)
+local custom_attach = function(client, bufnr)
   local filetype = vim.api.nvim_buf_get_option(0, "filetype")
 
-  if nvim_status then
-    nvim_status.on_attach(client)
-  end
-
   buf_inoremap { "<c-s>", vim.lsp.buf.signature_help }
 
   buf_nnoremap { "<space>cr", vim.lsp.buf.rename }
@@ -133,41 +123,48 @@ local custom_attach = function(client)
 
   -- Set autocommands conditional on server_capabilities
   if client.server_capabilities.documentHighlightProvider then
-    vim.cmd [[
-      augroup lsp_document_highlight
-        autocmd! * <buffer>
-        autocmd CursorHold <buffer> lua vim.lsp.buf.document_highlight()
-        autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references()
-      augroup END
-    ]]
+    autocmd_clear { group = augroup_highlight, buffer = bufnr }
+    autocmd { "CursorHold", augroup_highlight, vim.lsp.buf.document_highlight, buffer = bufnr }
+    autocmd { "CursorMoved", augroup_highlight, vim.lsp.buf.clear_references, buffer = bufnr }
   end
 
   if false and client.server_capabilities.codeLensProvider then
     if filetype ~= "elm" then
-      vim.cmd [[
-        augroup lsp_document_codelens
-          au! * <buffer>
-          autocmd BufEnter ++once         <buffer> lua require"vim.lsp.codelens".refresh()
-          autocmd BufWritePost,CursorHold <buffer> lua require"vim.lsp.codelens".refresh()
-        augroup END
-      ]]
+      autocmd_clear { group = augroup_codelens, buffer = bufnr }
+      autocmd { "BufEnter", augroup_codelens, vim.lsp.codelens.refresh, bufnr, once = true }
+      autocmd { { "BufWritePost", "CursorHold" }, augroup_codelens, vim.lsp.codelens.refresh, bufnr }
     end
   end
 
+  local caps = client.server_capabilities
+  if semantic and caps.semanticTokensProvider and caps.semanticTokensProvider.full then
+    autocmd_clear { group = augroup_semantic, buffer = bufnr }
+    autocmd { "TextChanged", augroup_semantic, vim.lsp.buf.semantic_tokens_full, bufnr }
+  end
+
   -- Attach any filetype specific options to the client
   filetype_attach[filetype](client)
 end
 
 local updated_capabilities = vim.lsp.protocol.make_client_capabilities()
-if nvim_status then
-  updated_capabilities = vim.tbl_deep_extend("keep", updated_capabilities, nvim_status.capabilities)
-end
-updated_capabilities.textDocument.codeLens = { dynamicRegistration = false }
-updated_capabilities = require("cmp_nvim_lsp").update_capabilities(updated_capabilities)
+
+-- Completion configuration
+require("cmp_nvim_lsp").update_capabilities(updated_capabilities)
 updated_capabilities.textDocument.completion.completionItem.insertReplaceSupport = false
 
-local rust_analyzer
+-- Semantic token configuration
+if semantic then
+  semantic.setup {
+    preset = "default",
+    highlighters = { require "nvim-semantic-tokens.table-highlighter" },
+  }
+
+  semantic.extend_capabilities(updated_capabilities)
+end
+
+updated_capabilities.textDocument.codeLens = { dynamicRegistration = false }
 
+local rust_analyzer, rust_analyzer_cmd = nil, { "rustup", "run", "nightly", "rust-analyzer" }
 local has_rt, rt = pcall(require, "rust-tools")
 if has_rt then
   local extension_path = vim.fn.expand "~/.vscode/extensions/sadge-vscode/extension/"
@@ -176,7 +173,7 @@ if has_rt then
 
   rt.setup {
     server = {
-      cmd = { "rustup", "run", "nightly", "rust-analyzer" },
+      cmd = rust_analyzer_cmd,
       capabilities = updated_capabilities,
       on_attach = custom_attach,
     },
@@ -191,13 +188,11 @@ if has_rt then
   }
 else
   rust_analyzer = {
-    cmd = { "rustup", "run", "nightly", "rust-analyzer" },
-    -- cmd = { "rust-analyzer" },
+    cmd = rust_analyzer_cmd,
   }
 end
 
 local servers = {
-
   -- Also uses `shellcheck` and `explainshell`
   bashls = true,
 
@@ -220,11 +215,9 @@ local servers = {
       "--clang-tidy",
       "--header-insertion=iwyu",
     },
-    -- Required for lsp-status
     init_options = {
       clangdFileStatus = true,
     },
-    handlers = nvim_status and nvim_status.extensions.clangd.setup() or nil,
   },
 
   gopls = {
@@ -423,25 +416,6 @@ end
 -- end
 --]]
 
--- python graveyard
--- lspconfig.pyls.setup {
---   plugins = {
---     pyls_mypy = {
---       enabled = true,
---       live_mode = false
---     }
---   },
---   on_init = custom_init,
---   on_attach = custom_attach,
---   capabilities = updated_capabilities,
--- }
-
--- lspconfig.jedi_language_server.setup {
---   on_init = custom_init,
---   on_attach = custom_attach,
---   capabilities = updated_capabilities,
--- }
-
 -- Set up null-ls
 local use_null = true
 if use_null then
@@ -456,6 +430,10 @@ if use_null then
   }
 end
 
+-- Can set this lower if needed.
+-- require("vim.lsp.log").set_level "debug"
+-- require("vim.lsp.log").set_level "trace"
+
 return {
   on_init = custom_init,
   on_attach = custom_attach,