nvim: migrate to new lsp stuff

Author: slice

nvim/lua/skip/plugins/lsp.lua

@@ -1,5 +1,4 @@
--- vim: set foldmethod=marker:
-local patched_lspconfig = false
+-- vim: set fdm=marker:
 
 return {
   {
@@ -8,42 +7,24 @@ return {
     event = { 'BufReadPre', 'BufNewFile' },
     config = function()
       local lsp = require 'skip.lsp'
-      local lsc = require 'lspconfig'
 
-      if not patched_lspconfig then
-        local original_bufname_valid = lsc.util.bufname_valid
-
-        -- some day, this'll break ... :O]
-        ---@diagnostic disable-next-line:duplicate-set-field
-        function lsc.util.bufname_valid(bufname)
-          -- reverse engineer bufnr :(
-          -- lspconfig pls let me conditionally attach (but early)
-          local bufs = vim.api.nvim_list_bufs()
-          for _, bufnr in ipairs(bufs) do
-            if
-              vim.api.nvim_buf_is_valid(bufnr)
-              and vim.api.nvim_buf_is_loaded(bufnr)
-              and vim.api.nvim_buf_get_name(bufnr) == bufname
-            then
-              if not lsp.attach_allowed(bufnr) then
-                return false
-              end
-            end
+      vim.lsp.config('*', {
+        root_dir = function(bufnr, on_dir)
+          if lsp.attach_allowed(bufnr) then
+            on_dir(vim.fs.root(bufnr, { '.git', '.jj', '.github', 'package.json' }))
           end
+        end,
+        capabilities = lsp.capabilities,
+      })
 
-          return original_bufname_valid(bufname)
-        end
-
-        patched_lspconfig = true
-      end
-
+      -- diagnostic config {{{
+      -- TODO: this doesn't belong here!!!!
       local signs = {
         [vim.diagnostic.severity.ERROR] = '󰋔 ',
         [vim.diagnostic.severity.WARN] = ' ',
         [vim.diagnostic.severity.HINT] = ' ',
         [vim.diagnostic.severity.INFO] = ' ',
       }
-      -- TODO: this doesn't belong here!!!!
       vim.diagnostic.config {
         -- make warnings and errors appear over hints
         severity_sort = true,
@@ -59,14 +40,10 @@ return {
           header = '',
         },
       }
+      -- }}}
 
-      lsc.util.default_config =
-        vim.tbl_deep_extend('force', lsc.util.default_config, {
-          capabilities = lsp.capabilities,
-          codelens = { enabled = true },
-        })
-
-      lsc.yamlls.setup {
+      -- yamlls {{{
+      vim.lsp.config('yamlls', {
         settings = {
           yaml = {
             schemas = {
@@ -76,58 +53,19 @@ return {
               ['http://json.schemastore.org/prettierrc'] = '.prettierrc.{yml,yaml}',
               ['http://json.schemastore.org/kustomization'] = 'kustomization.{yml,yaml}',
               ['http://json.schemastore.org/chart'] = 'Chart.{yml,yaml}',
-              ['https://raw.githubusercontent.com/datreeio/CRDs-catalog/main/argoproj.io/application_v1alpha1.json'] = '*.argo-application.{yml,yaml}',
-              ['https://raw.githubusercontent.com/datreeio/CRDs-catalog/main/argoproj.io/appproject_v1alpha1.json'] = '*.argo-appproject.{yml,yaml}',
-              ['https://raw.githubusercontent.com/datreeio/CRDs-catalog/main/argoproj.io/applicationset_v1alpha1.json'] = '*.argo-applicationset.{yml,yaml}',
+              ['https://raw.githubusercontent.com/datreeio/CRDs-catalog/main/argoproj.io/application_v1alpha1.json'] =
+              '*.argo-application.{yml,yaml}',
+              ['https://raw.githubusercontent.com/datreeio/CRDs-catalog/main/argoproj.io/appproject_v1alpha1.json'] =
+              '*.argo-appproject.{yml,yaml}',
+              ['https://raw.githubusercontent.com/datreeio/CRDs-catalog/main/argoproj.io/applicationset_v1alpha1.json'] =
+              '*.argo-applicationset.{yml,yaml}',
             },
-          },
-        },
-        handlers = {
-          ['textDocument/publishDiagnostics'] = function(
-            err,
-            result,
-            ctx,
-            config
-          )
-            local is_k8s_file = vim.endswith(result.uri, '.k8s.yml')
-              or vim.endswith(result.uri, '.k8s.yaml')
-            if not is_k8s_file then
-              return vim.lsp.diagnostic.on_publish_diagnostics(
-                err,
-                result,
-                ctx,
-                config
-              )
-            end
-
-            local filtered_diagnostics = vim
-              .iter(result.diagnostics)
-              :filter(function(diagnostic)
-                return not (
-                  diagnostic.message
-                    == 'Matches multiple schemas when only one must validate.'
-                  and diagnostic.code == 0
-                )
-              end)
-              :totable()
-
-            return vim.lsp.diagnostic.on_publish_diagnostics(
-              err,
-              vim.tbl_extend(
-                'force',
-                result,
-                { diagnostics = filtered_diagnostics }
-              ),
-              ctx,
-              config
-            )
-          end,
-        },
-      }
-
-      lsc.vtsls.setup {
-        root_dir = lsc.util.root_pattern('package.json'),
-        single_file_support = false,
+          }
+        }
+      })
+      -- }}}
+      -- vtsls {{{
+      vim.lsp.config('vtsls', {
         settings = {
           vtsls = {
             enableMoveToFileCodeAction = true,
@@ -154,137 +92,34 @@ return {
             format = { enable = false },
           },
         },
-        ---@param client vim.lsp.Client
-        ---@param buffer number
-        on_attach = function(client, buffer)
-          -- this is stolen from LazyVim (thanks)
-          client.commands['_typescript.moveToFileRefactoring'] = function(
-            command,
-            ctx
-          )
-            ---@type string, string, lsp.Range
-            local action, uri, range = unpack(command.arguments)
-
-            local function move(newf)
-              client.request('workspace/executeCommand', {
-                command = command.command,
-                arguments = { action, uri, range, newf },
-              })
-            end
-
-            local fname = vim.uri_to_fname(uri)
-            client.request('workspace/executeCommand', {
-              command = 'typescript.tsserverRequest',
-              arguments = {
-                'getMoveToRefactoringFileSuggestions',
-                {
-                  file = fname,
-                  startLine = range.start.line + 1,
-                  startOffset = range.start.character + 1,
-                  endLine = range['end'].line + 1,
-                  endOffset = range['end'].character + 1,
-                },
-              },
-            }, function(_, result)
-              ---@type string[]
-              local files = result.body.files
-              table.insert(files, 1, 'Manually specify path...')
-              vim.ui.select(files, {
-                prompt = 'Move where?',
-                format_item = function(f)
-                  return vim.fn.fnamemodify(f, ':~:.')
-                end,
-              }, function(f)
-                if f and f:find('^Manually specify path') then
-                  vim.ui.input({
-                    prompt = 'Specify move destination:',
-                    default = vim.fn.fnamemodify(fname, ':h') .. '/',
-                    completion = 'file',
-                  }, function(newf)
-                    return newf and move(newf)
-                  end)
-                elseif f then
-                  move(f)
-                end
-              end)
-            end)
-          end
-        end,
-      }
-
-      -- lsp.eslint.setup {}
-      lsc.gh_actions_ls.setup {
+      })
+      -- }}}
+      -- gh_actions_ls {{{
+      vim.lsp.config('gh_actions_ls', {
         filetypes = { 'yaml.github' },
-      }
-      lsc.clangd.setup {}
-
-      -- this check should probably live somewhere else
-      local uname = vim.uv.os_uname()
-      local macos = uname.sysname == 'Darwin'
-      -- https://github.com/nix-community/nixd {{{
-      if macos then
-        local hostname = vim.split(vim.uv.os_gethostname(), '%.')[1]
-        local flake_path = vim.fs.abspath('~/Developer/prj/nixfiles')
-        local username = vim.env.USER
-
-        local extra_evals = {
-          nix_darwin = {
-            -- 1) ~/Developer is a symlink to ~/src on both of my machines
-            -- 2) if this goes through a symlink, it explodes
-            expr = ('(builtins.getFlake "%s").darwinConfigurations.%s.options'):format(
-              flake_path,
-              hostname
-            ),
-          },
-          home_manager = {
-            expr = ('(builtins.getFlake "%s").packages.aarch64-darwin.homeConfigurations.%s.options'):format(
-              flake_path,
-              username
-            ),
-          },
-        }
-        lsc.nixd.setup {
-          settings = {
-            nixd = {
-              options = extra_evals,
-            },
-          },
-        }
-      end
+      })
       -- }}}
-
-      lsc.pyright.setup {}
-      lsc.lua_ls.setup {
-        enabled = true,
-        settings = {
-          format = { enable = false },
-        },
-      }
-      lsc.gopls.setup {}
-      lsc.bashls.setup {}
-      lsc.dhall_lsp_server.setup {}
-      lsc.tailwindcss.setup {
+      -- tailwindcss {{{
+      vim.lsp.config('tailwindcss', {
         settings = {
           tailwindCSS = {
             experimental = {
               classRegex = {
                 { 'cva\\(([^)]*)\\)', '["\'`]([^"\'`]*).*?["\'`]' },
-                { 'cx\\(([^)]*)\\)', "(?:'|\"|`)([^']*)(?:'|\"|`)" },
+                { 'cx\\(([^)]*)\\)',  "(?:'|\"|`)([^']*)(?:'|\"|`)" },
               },
             },
           },
-        },
-      }
-      lsc.denols.setup {
-        root_dir = lsc.util.root_pattern('deno.json', 'deno.jsonc'),
-      }
-
+        }
+      })
+      -- }}}
+      -- cssls,jsonls,html {{{
       for _, server in ipairs({
         'cssls',
         'jsonls',
         'html',
       }) do
-        lsc[server].setup {
+        vim.lsp.config(server, {
           settings = {
             css = {
               lint = {
@@ -293,26 +128,10 @@ return {
               },
             },
           },
-          init_options = { provideFormatter = false },
-          handlers = {
-            ['textDocument/diagnostic'] = function(err, result, ctx, config)
-              if
-                err ~= nil
-                and err.code == -32601
-                and err.message:find('Unhandled method')
-              then
-                -- html language server always returns an error in response to
-                -- neovim querying it for diagnostics (?), so just ignore this
-                -- to avoid polluting notifications
-                return {}, nil
-              end
-              return vim.lsp.diagnostic.on_diagnostic(err, result, ctx, config)
-            end,
-          },
-        }
+        })
       end
-
-      -- xcrun -sdk macosx --find sourcekit-lsp
+      -- }}}
+      -- sourcekit {{{
       vim.system(
         { 'xcrun', '-sdk', 'macosx', '--find', 'sourcekit-lsp' },
         { system = true },
@@ -332,26 +151,16 @@ return {
             --   { textDocument = { completion = { dynamicRegistration = true } } }
             -- )
 
-            lsc.sourcekit.setup {
+            vim.lsp.config('sourcekit', {
               cmd = { path },
               -- capabilities = capabilities,
-            }
+            })
           end)
         end
       )
-
-      lsc.hls.setup {
-        filetypes = { 'haskell', 'lhaskell', 'cabal' },
-        settings = {
-          haskell = {
-            plugin = {
-              rename = { config = { crossModule = true } },
-            },
-          },
-        },
-      }
-
-      lsc.rust_analyzer.setup {
+      -- }}}
+      -- rust_analyzer {{{
+      vim.lsp.config('rust_analyzer', {
         capabilities = lsp.capabilities,
         settings = {
           ['rust-analyzer'] = {
@@ -381,7 +190,23 @@ return {
             },
           },
         },
-      }
+      })
+      -- }}}
+
+      vim.lsp.enable({
+        'pyright',
+        'lua_ls',
+        'vtsls',
+        'yamlls',
+        'gopls',
+        'bashls',
+        'tailwindcss',
+        'rust_analyzer',
+        'sourcekit',
+        'html',
+        'cssls',
+        'jsonls',
+      })
     end,
   },
 
@@ -407,7 +232,7 @@ return {
     end,
     config = function(self, metals_config)
       local nvim_metals_group =
-        vim.api.nvim_create_augroup('nvim-metals', { clear = true })
+          vim.api.nvim_create_augroup('nvim-metals', { clear = true })
       vim.api.nvim_create_autocmd('FileType', {
         pattern = self.ft,
         callback = function()