Merge pull request #1668 from snoweuph/fixes

Fixes

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

@@ -377,6 +377,10 @@
   - `bash` = `ash`, `dash`, `zsh`
   - `yaml` = `yaml`
 
+- Fix `astro-language-server` missing typescript.
+
+- Fixed broken filetypes.
+
 - Added `vim.lsp.presets.<name>` to contain LSP configurations. This allows for
   more flexibility in nvf and reuse of LSPs across languages. Dropped
   `deprecatedSingleOrListOf` in favor of `listOf` for the affected LSP options.

modules/plugins/languages/glsl.nix

@@ -45,6 +45,17 @@ in {
   };
 
   config = mkIf cfg.enable (mkMerge [
+    {
+      vim.filetype.extension = {
+        vert = "glsl";
+        tesc = "glsl";
+        tese = "glsl";
+        frag = "glsl";
+        geom = "glsl";
+        comp = "glsl";
+      };
+    }
+
     (mkIf cfg.treesitter.enable {
       vim.treesitter = {
         enable = true;
@@ -56,7 +67,7 @@ in {
       vim.lsp = {
         presets = genAttrs cfg.lsp.servers (_: {enable = true;});
         servers = genAttrs cfg.lsp.servers (_: {
-          filetypes = ["glsl" "vert" "tesc" "tese" "frag" "geom" "comp"];
+          filetypes = ["glsl"];
         });
       };
     })

modules/plugins/languages/go.nix

@@ -190,6 +190,13 @@ in {
   };
 
   config = mkIf cfg.enable (mkMerge [
+    {
+      vim.filetype.extension = {
+        gohtml = "gotmpl";
+        tmpl = "gotmpl";
+      };
+    }
+
     (mkIf cfg.treesitter.enable {
       vim.treesitter = {
         enable = true;

modules/plugins/languages/html.nix

@@ -112,7 +112,7 @@ in {
       vim.lsp = {
         presets = genAttrs cfg.lsp.servers (_: {enable = true;});
         servers = genAttrs cfg.lsp.servers (_: {
-          filetypes = ["html" "shtml" "xhtml" "htm"];
+          filetypes = ["html" "xhtml"];
         });
       };
     })

modules/plugins/languages/markdown.nix

@@ -153,6 +153,10 @@ in {
   };
 
   config = mkIf cfg.enable (mkMerge [
+    {
+      vim.filetype.extension.mdx = "markdown";
+    }
+
     (mkIf cfg.treesitter.enable {
       vim.treesitter.enable = true;
       vim.treesitter.grammars = [cfg.treesitter.mdPackage cfg.treesitter.mdInlinePackage];
@@ -162,7 +166,7 @@ in {
       vim.lsp = {
         presets = genAttrs cfg.lsp.servers (_: {enable = true;});
         servers = genAttrs cfg.lsp.servers (_: {
-          filetypes = ["markdown" "mdx"];
+          filetypes = ["markdown"];
         });
       };
     })

modules/plugins/languages/qml.nix

@@ -82,7 +82,7 @@ in {
       vim.lsp = {
         presets = genAttrs cfg.lsp.servers (_: {enable = true;});
         servers = genAttrs cfg.lsp.servers (_: {
-          filetypes = ["qml" "qmljs"];
+          filetypes = ["qml"];
         });
       };
     })

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

@@ -18,11 +18,18 @@ in {
   config = mkIf cfg.enable {
     vim.lsp.servers.astro-language-server = {
       enable = true;
-      cmd = [(getExe pkgs.astro-language-server) "--stdio"];
+      cmd = [
+        (getExe (pkgs.symlinkJoin {
+          name = "astro-ls-wrapper";
+          paths = [pkgs.astro-language-server];
+          meta.mainProgram = "astro-ls";
+          buildInputs = [pkgs.makeBinaryWrapper];
+          postBuild = "wrapProgram $out/bin/astro-ls --prefix NODE_PATH : '${pkgs.typescript}/lib/node_modules'";
+        }))
+        "--stdio"
+      ];
       root_markers = [".git" "package.json" "tsconfig.json" "jsconfig.json"];
-      init_options = {
-        typescript = {};
-      };
+      init_options.typescript = {};
       before_init = mkLuaInline ''
         function(_, config)
           if config.init_options and config.init_options.typescript and not config.init_options.typescript.tsdk then

modules/plugins/lsp/presets/harper.nix

@@ -17,13 +17,11 @@
     "cmake"
     "cpp"
     "cs"
-    "daml"
     "dart"
     "gitcommit"
     "go"
     "haskell"
     "html"
-    "ink"
     "java"
     "javascript"
     "javascriptreact"

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

@@ -39,7 +39,6 @@
     "leaf"
     "liquid"
     "markdown"
-    "mdx"
     "mustache"
     "njk"
     "nunjucks"