mirror of
https://github.com/NotAShelf/nvf.git
synced 2026-04-27 03:47:37 +00:00
languages/css: refactor lsp.servers to use lsp/presets/<name>
This commit is contained in:
parent
b5d6c6fad7
commit
e00bf6ceac
2 changed files with 18 additions and 23 deletions
|
|
@ -6,29 +6,17 @@
|
|||
}: let
|
||||
inherit (builtins) attrNames;
|
||||
inherit (lib.options) mkEnableOption mkOption literalExpression;
|
||||
inherit (lib) genAttrs;
|
||||
inherit (lib.meta) getExe;
|
||||
inherit (lib.modules) mkIf mkMerge;
|
||||
inherit (lib.types) enum;
|
||||
inherit (lib.types) enum listOf;
|
||||
inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
|
||||
inherit (lib.nvim.attrsets) mapListToAttrs;
|
||||
|
||||
cfg = config.vim.languages.css;
|
||||
|
||||
defaultServer = ["cssls"];
|
||||
servers = {
|
||||
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;
|
||||
};
|
||||
};
|
||||
};
|
||||
defaultServer = ["vscode-css-language-server"];
|
||||
servers = ["vscode-css-language-server"];
|
||||
|
||||
defaultFormat = ["prettier"];
|
||||
formats = {
|
||||
|
|
@ -68,7 +56,7 @@ in {
|
|||
};
|
||||
|
||||
servers = mkOption {
|
||||
type = deprecatedSingleOrListOf "vim.language.css.lsp.servers" (enum (attrNames servers));
|
||||
type = listOf (enum servers);
|
||||
default = defaultServer;
|
||||
description = "CSS LSP server to use";
|
||||
};
|
||||
|
|
@ -92,12 +80,17 @@ in {
|
|||
})
|
||||
|
||||
(mkIf cfg.lsp.enable {
|
||||
vim.lsp.servers =
|
||||
mapListToAttrs (name: {
|
||||
inherit name;
|
||||
value = servers.${name};
|
||||
})
|
||||
cfg.lsp.servers;
|
||||
vim.lsp = {
|
||||
presets = genAttrs cfg.lsp.servers (_: {enable = true;});
|
||||
servers = genAttrs cfg.lsp.servers (_: {
|
||||
filetypes = [
|
||||
"css"
|
||||
# TODO: split in their own modules
|
||||
"scss"
|
||||
"less"
|
||||
];
|
||||
});
|
||||
};
|
||||
})
|
||||
|
||||
(mkIf cfg.format.enable {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue