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

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

Browse source
This commit is contained in:
Snoweuph 2026-04-11 17:24:43 +02:00
commit c59a614a3a
No known key found for this signature in database
GPG key ID: BEFC41DA223CEC55
1 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

27
modules/plugins/languages/qml.nix
View file

@ -5,10 +5,10 @@
... ...
}: let }: let
inherit (builtins) attrNames; inherit (builtins) attrNames;
inherit (lib.meta) getExe';
inherit (lib.options) mkEnableOption mkOption literalExpression; inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) enum; inherit (lib) genAttrs;
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;
@ -17,13 +17,7 @@
qmlPackage = pkgs.kdePackages.qtdeclarative; qmlPackage = pkgs.kdePackages.qtdeclarative;
defaultServers = ["qmlls"]; defaultServers = ["qmlls"];
servers = { servers = ["qmlls"];
qmlls = {
cmd = [(getExe' qmlPackage "qmlls")];
filetypes = ["qml" "qmljs"];
rootmarkers = [".git"];
};
};
defaultFormat = ["qmlformat"]; defaultFormat = ["qmlformat"];
formats = { formats = {
@ -54,7 +48,7 @@ in {
defaultText = literalExpression "config.vim.lsp.enable"; defaultText = literalExpression "config.vim.lsp.enable";
}; };
servers = mkOption { servers = mkOption {
type = deprecatedSingleOrListOf "vim.language.qml.lsp.servers" (enum (attrNames servers)); type = listOf (enum servers);
default = defaultServers; default = defaultServers;
description = "QML LSP server to use"; description = "QML LSP server to use";
}; };
@ -83,13 +77,14 @@ in {
grammars = [cfg.treesitter.package]; grammars = [cfg.treesitter.package];
}; };
}) })
(mkIf cfg.lsp.enable { (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 = ["qml" "qmljs"];
}) });
cfg.lsp.servers; };
}) })
(mkIf (cfg.format.enable && !cfg.lsp.enable) { (mkIf (cfg.format.enable && !cfg.lsp.enable) {