NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-05-17 20:48:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

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

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

@ -93,6 +93,8 @@
- Renamed `jsonls` to `vscode-json-language-server`. - Renamed `jsonls` to `vscode-json-language-server`.
- Renamed `cssls` to `vscode-css-language-server`.
- Renamed `jdtls` to `jdt-language-server`. - Renamed `jdtls` to `jdt-language-server`.
- Renamed `elixirls` to `elixir-ls`. - Renamed `elixirls` to `elixir-ls`.

39
modules/plugins/languages/css.nix
View file

@ -6,29 +6,17 @@
}: let }: let
inherit (builtins) attrNames; inherit (builtins) attrNames;
inherit (lib.options) mkEnableOption mkOption literalExpression; inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib) genAttrs;
inherit (lib.meta) 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.nvim.types) mkGrammarOption deprecatedSingleOrListOf; inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
inherit (lib.nvim.attrsets) mapListToAttrs; inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.css; cfg = config.vim.languages.css;
defaultServer = ["cssls"]; defaultServer = ["vscode-css-language-server"];
servers = { servers = ["vscode-css-language-server"];
cssls = {
cmd = ["${pkgs.vscode-langservers-extracted}/bin/vscode-css-language-server" "--stdio"];
filetypes = ["css" "scss" "less"];
# needed to enable formatting
init_options = {provideFormatter = true;};
root_markers = [".git" "package.json"];
settings = {
css.validate = true;
scss.validate = true;
less.validate = true;
};
};
};
defaultFormat = ["prettier"]; defaultFormat = ["prettier"];
formats = { formats = {
@ -68,7 +56,7 @@ in {
}; };
servers = mkOption { servers = mkOption {
type = deprecatedSingleOrListOf "vim.language.css.lsp.servers" (enum (attrNames servers)); type = listOf (enum servers);
default = defaultServer; default = defaultServer;
description = "CSS LSP server to use"; description = "CSS LSP server to use";
}; };
@ -92,12 +80,17 @@ 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 = [
}) "css"
cfg.lsp.servers; # TODO: split in their own modules
"scss"
"less"
];
});
};
}) })
(mkIf cfg.format.enable { (mkIf cfg.format.enable {