NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-04-27 11:55:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Snoweuph 2026-04-12 00:31:07 +02:00
commit 0af8457666
No known key found for this signature in database
GPG key ID: BEFC41DA223CEC55
2 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/manual/release-notes/rl-0.9.md
View file

@ -91,6 +91,8 @@
- Renamed `bash-ls` to `bash-language-server`. - Renamed `bash-ls` to `bash-language-server`.
- Renamed `jsonls` to `vscode-json-language-server`.
- Removed `languages.tailwind` which only provided an LSP. Use - Removed `languages.tailwind` which only provided an LSP. Use
`lsp.presets.tailwindcss-language-server` instead. `lsp.presets.tailwindcss-language-server` instead.

30
modules/plugins/languages/json.nix
View file

@ -6,23 +6,17 @@
}: let }: let
inherit (builtins) attrNames; inherit (builtins) attrNames;
inherit (lib.options) mkOption mkEnableOption literalExpression; inherit (lib.options) mkOption mkEnableOption literalExpression;
inherit (lib.meta) getExe' getExe; inherit (lib.meta) getExe;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) enum; inherit (lib.types) enum listOf;
inherit (lib) genAttrs;
inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf; inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
inherit (lib.nvim.attrsets) mapListToAttrs; inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.json; cfg = config.vim.languages.json;
defaultServers = ["jsonls"]; defaultServers = ["vscode-json-language-server"];
servers = { servers = ["vscode-json-language-server"];
jsonls = {
cmd = [(getExe' pkgs.vscode-langservers-extracted "vscode-json-language-server") "--stdio"];
filetypes = ["json" "jsonc" "json5"];
init_options = {provideFormatter = true;};
root_markers = [".git"];
};
};
defaultFormat = ["jsonfmt"]; defaultFormat = ["jsonfmt"];
@ -57,7 +51,7 @@ in {
}; };
servers = mkOption { servers = mkOption {
type = deprecatedSingleOrListOf "vim.language.json.lsp.servers" (enum (attrNames servers)); type = listOf (enum servers);
default = defaultServers; default = defaultServers;
description = "JSON LSP server to use"; description = "JSON LSP server to use";
}; };
@ -89,12 +83,12 @@ in {
}) })
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {
vim.lsp.servers = vim.lsp = {
mapListToAttrs (name: { presets = genAttrs cfg.lsp.servers (_: {enable = true;});
inherit name; servers = genAttrs cfg.lsp.servers (_: {
value = servers.${name}; filetypes = ["json" "jsonc" "json5"];
}) });
cfg.lsp.servers; };
}) })
(mkIf cfg.format.enable { (mkIf cfg.format.enable {