languages/typst: refactor lsp.servers to use lsp/presets/<name>

docs/manual/release-notes/rl-0.9.md

@@ -65,6 +65,10 @@
 
 - Moved `vim.lsp.harper-ls` to `vim.lsp.presets.haper`.
 
+- Removed `typst_lsp` from `languages.typst.lsp.servers`, because it is
+  deprecated and thus was pulled from nixpkgs.
+  <https://github.com/NixOS/nixpkgs/commit/bf24296bbe2e31ac7147b02ea645922390ca8f4b>
+
 - Renamed `ts_ls` to `typescript-language-server`.
 
 - Renamed `denols` to `deno`.

modules/plugins/languages/typst.nix

@@ -6,92 +6,21 @@
 }: let
   inherit (lib.options) mkOption mkEnableOption literalExpression;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.types) nullOr enum attrsOf listOf package str bool int;
+  inherit (lib.types) nullOr enum attrsOf listOf str bool int;
   inherit (lib.attrsets) attrNames;
+  inherit (lib) genAttrs;
   inherit (lib.meta) getExe;
   inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption deprecatedSingleOrListOf;
   inherit (lib.nvim.dag) entryAnywhere;
   inherit (lib.nvim.lua) toLuaObject;
   inherit (lib.nvim.attrsets) mapListToAttrs;
   inherit (lib.nvim.binds) mkKeymap;
-  inherit (lib.generators) mkLuaInline;
   inherit (config.vim.lib) mkMappingOption;
 
   cfg = config.vim.languages.typst;
 
   defaultServers = ["tinymist"];
-  servers = {
+  servers = ["tinymist"];
-    typst_lsp = {
-      enable = true;
-      cmd = [(getExe pkgs.typst-lsp)];
-      filetypes = ["typst"];
-      root_markers = [".git"];
-      on_attach = mkLuaInline ''
-        function(client, bufnr)
-          -- Disable semantic tokens as a workaround for a semantic token error when using non-english characters
-          client.server_capabilities.semanticTokensProvider = nil
-        end
-      '';
-    };
-
-    tinymist = {
-      enable = true;
-      cmd = [(getExe pkgs.tinymist)];
-      filetypes = ["typst"];
-      root_markers = [".git"];
-      on_attach = mkLuaInline ''
-        function(client, bufnr)
-          local function create_tinymist_command(command_name, client, bufnr)
-            local export_type = command_name:match 'tinymist%.export(%w+)'
-            local info_type = command_name:match 'tinymist%.(%w+)'
-            if info_type and info_type:match '^get' then
-              info_type = info_type:gsub('^get', 'Get')
-            end
-            local cmd_display = export_type or info_type
-            local function run_tinymist_command()
-              local arguments = { vim.api.nvim_buf_get_name(bufnr) }
-              local title_str = export_type and ('Export ' .. cmd_display) or cmd_display
-              local function handler(err, res)
-                if err then
-                  return vim.notify(err.code .. ': ' .. err.message, vim.log.levels.ERROR)
-                end
-                vim.notify(export_type and res or vim.inspect(res), vim.log.levels.INFO)
-              end
-              if vim.fn.has 'nvim-0.11' == 1 then
-                return client:exec_cmd({
-                  title = title_str,
-                  command = command_name,
-                  arguments = arguments,
-                }, { bufnr = bufnr }, handler)
-              else
-                return vim.notify('Tinymist commands require Neovim 0.11+', vim.log.levels.WARN)
-              end
-            end
-            local cmd_name = export_type and ('LspTinymistExport' .. cmd_display) or ('LspTinymist' .. cmd_display)
-            local cmd_desc = export_type and ('Export to ' .. cmd_display) or ('Get ' .. cmd_display)
-            return run_tinymist_command, cmd_name, cmd_desc
-          end
-
-          for _, command in ipairs {
-            'tinymist.exportSvg',
-            'tinymist.exportPng',
-            'tinymist.exportPdf',
-            'tinymist.exportMarkdown',
-            'tinymist.exportText',
-            'tinymist.exportQuery',
-            'tinymist.exportAnsiHighlight',
-            'tinymist.getServerInfo',
-            'tinymist.getDocumentTrace',
-            'tinymist.getWorkspaceLabels',
-            'tinymist.getDocumentMetrics',
-          } do
-            local cmd_func, cmd_name, cmd_desc = create_tinymist_command(command, client, bufnr)
-            vim.api.nvim_buf_create_user_command(bufnr, cmd_name, cmd_func, { nargs = 0, desc = cmd_desc })
-          end
-        end
-      '';
-    };
-  };
 
   defaultFormat = ["typstyle"];
   formats = {
@@ -123,7 +52,7 @@ in {
         };
 
       servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.typst.lsp.servers" (enum (attrNames servers));
+        type = listOf (enum servers);
         default = defaultServers;
         description = "Typst LSP server to use";
       };
@@ -261,12 +190,12 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
+      vim.lsp = {
-        mapListToAttrs (n: {
+        presets = genAttrs cfg.lsp.servers (_: {enable = true;});
-          name = n;
+        servers = genAttrs cfg.lsp.servers (_: {
-          value = servers.${n};
+          filetypes = ["typst"];
-        })
+        });
-        cfg.lsp.servers;
+      };
     })
 
     # Extensions