Merge pull request #1524 from snoweuph/feat/emmet-them-all

Emmet them all

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

@@ -316,6 +316,13 @@
 
 - Added Makefile support via `languages.make`.
 
+- Add `lsp.presets.emmet-ls` as supported LSP to
+  - `languages.jinja`
+  - `languages.liquid`
+  - `languages.tera`
+  - `languages.twig`
+  - `languages.astro`
+
 - Fix `languages.hcl` init, depending on `comment-nvim` by checking if it is
   enabled. Fixes a crash (#1350).
 

modules/plugins/languages/astro.nix

@@ -17,7 +17,7 @@
   cfg = config.vim.languages.astro;
 
   defaultServers = ["astro-language-server"];
-  servers = ["astro-language-server"];
+  servers = ["astro-language-server" "emmet-ls"];
 
   defaultFormat = ["prettier"];
   formats = let

modules/plugins/languages/jinja.nix

@@ -13,7 +13,7 @@
   cfg = config.vim.languages.jinja;
 
   defaultServers = ["jinja-lsp"];
-  servers = ["jinja-lsp"];
+  servers = ["jinja-lsp" "emmet-ls"];
 in {
   options.vim.languages.jinja = {
     enable = mkEnableOption "Jinja template language support";

modules/plugins/languages/liquid.nix

@@ -4,11 +4,16 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption literalExpression;
+  inherit (lib) genAttrs;
+  inherit (lib.options) mkEnableOption literalExpression mkOption;
   inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.types) enum listOf;
   inherit (lib.nvim.types) mkGrammarOption;
 
   cfg = config.vim.languages.liquid;
+
+  defaultServers = [];
+  servers = ["emmet-ls"];
 in {
   options.vim.languages.liquid = {
     enable = mkEnableOption "Liquid templating language support";
@@ -22,6 +27,21 @@ in {
         };
       package = mkGrammarOption pkgs "liquid";
     };
+
+    lsp = {
+      enable =
+        mkEnableOption "Liquid LSP support"
+        // {
+          default = config.vim.lsp.enable;
+          defaultText = literalExpression "config.vim.lsp.enable";
+        };
+      servers = mkOption {
+        description = "Liquid LSP server to use";
+        type = listOf (enum servers);
+        default = defaultServers;
+      };
+    };
+
     # TODO: if curlylint gets packaged for nix, add it.
   };
 
@@ -30,5 +50,14 @@ in {
       vim.treesitter.enable = true;
       vim.treesitter.grammars = [cfg.treesitter.package];
     })
+
+    (mkIf cfg.lsp.enable {
+      vim.lsp = {
+        presets = genAttrs cfg.lsp.servers (_: {enable = true;});
+        servers = genAttrs cfg.lsp.servers (_: {
+          filetypes = ["liquid"];
+        });
+      };
+    })
   ]);
 }

modules/plugins/languages/tera.nix

@@ -4,11 +4,16 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkEnableOption literalExpression;
+  inherit (lib) genAttrs;
+  inherit (lib.options) mkEnableOption literalExpression mkOption;
   inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.types) enum listOf;
   inherit (lib.nvim.types) mkGrammarOption;
 
   cfg = config.vim.languages.tera;
+
+  defaultServers = [];
+  servers = ["emmet-ls"];
 in {
   options.vim.languages.tera = {
     enable = mkEnableOption "Tera templating language support";
@@ -22,6 +27,20 @@ in {
         };
       package = mkGrammarOption pkgs "tera";
     };
+
+    lsp = {
+      enable =
+        mkEnableOption "Tera LSP support"
+        // {
+          default = config.vim.lsp.enable;
+          defaultText = literalExpression "config.vim.lsp.enable";
+        };
+      servers = mkOption {
+        description = "Tera LSP server to use";
+        type = listOf (enum servers);
+        default = defaultServers;
+      };
+    };
   };
 
   config = mkIf cfg.enable (mkMerge [
@@ -29,5 +48,14 @@ in {
       vim.treesitter.enable = true;
       vim.treesitter.grammars = [cfg.treesitter.package];
     })
+
+    (mkIf cfg.lsp.enable {
+      vim.lsp = {
+        presets = genAttrs cfg.lsp.servers (_: {enable = true;});
+        servers = genAttrs cfg.lsp.servers (_: {
+          filetypes = ["tera"];
+        });
+      };
+    })
   ]);
 }

modules/plugins/languages/ts.nix

@@ -174,7 +174,6 @@ in {
       vim.lsp = {
         presets = genAttrs cfg.lsp.servers (_: {enable = true;});
         servers = genAttrs cfg.lsp.servers (_: {
-          root_markers = ["tsconfig.json"];
           filetypes = [
             "typescript"
             # TODO: move to a React module

modules/plugins/languages/twig.nix

@@ -16,7 +16,7 @@
   cfg = config.vim.languages.twig;
 
   defaultServers = ["twig-language-server"];
-  servers = ["twig-language-server"];
+  servers = ["twig-language-server" "emmet-ls"];
 
   defaultFormat = ["djlint"];
   formats = {

modules/plugins/lsp/presets/typescript-go.nix

@@ -18,7 +18,7 @@ in {
     vim.lsp.servers.typescript-go = {
       enable = true;
       cmd = [(getExe pkgs.typescript-go) "--lsp" "--stdio"];
-      root_markers = [".git" "package.json"];
+      root_markers = [".git" "tsconfig.json" "package.json"];
     };
   };
 }

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

@@ -19,7 +19,7 @@ in {
     vim.lsp.servers.typescript-language-server = {
       enable = true;
       cmd = [(getExe pkgs.typescript-language-server) "--stdio"];
-      root_markers = [".git" "package.json"];
+      root_markers = [".git" "tsconfig.json" "package.json"];
       init_options = {hostInfo = "neovim";};
       handlers = {
         # handle rename request for certain code actions like extracting functions / types