Merge f2af90654a into 5dc8f3a34c

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

@@ -279,6 +279,9 @@
 
 - Added support for neovim 0.12's `ui2` feature via `vim.ui.ui2`
 
+- Added support for the `qml-language-server` package in `languages.qml` and the
+  new LSP preset for it
+
 [Machshev](https://github.com/machshev):
 
 - Added `ruff` and `ty` LSP support for Python under `programs.python`.

modules/plugins/languages/qml.nix

@@ -17,7 +17,10 @@
   qmlPackage = pkgs.kdePackages.qtdeclarative;
 
   defaultServers = ["qmlls"];
-  servers = ["qmlls"];
+  servers = [
+    "qml-language-server"
+    "qmlls"
+  ];
 
   defaultFormat = ["qmlformat"];
   formats = {

modules/plugins/lsp/presets/default.nix

@@ -47,6 +47,7 @@
     ./pyrefly.nix
     ./pyright.nix
     ./python-lsp-server.nix
+    ./qml-language-server.nix
     ./qmlls.nix
     ./r-languageserver.nix
     ./roslyn-ls.nix

modules/plugins/lsp/presets/qml-language-server.nix

@@ -0,0 +1,28 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (lib.meta) getExe;
+  inherit (lib.modules) mkIf;
+  inherit (lib.nvim.types) mkLspPresetEnableOption;
+
+  cfg = config.vim.lsp.presets.qmlls;
+in {
+  options.vim.lsp.presets.qml-language-server = {
+    enable = mkLspPresetEnableOption "qml-language-server" "QML" [];
+  };
+
+  config = mkIf cfg.enable {
+    vim.lsp.servers.qml-language-server = {
+      enable = true;
+      cmd = [(getExe pkgs.qml-language-server)];
+      root_markers = [
+        ".git"
+        "qmldir"
+        "shell.qml"
+      ];
+    };
+  };
+}