refactor(pack): improve packs that add custom treesitter parsers

AstroNvim · Dec 20, 2023 · 55a69bd · 55a69bd
1 parent 85781f4
commit 55a69bd
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 58 deletions.
diff --git a/lua/astrocommunity/pack/haxe/init.lua b/lua/astrocommunity/pack/haxe/init.lua
@@ -1,19 +1,20 @@
-local utils = require "astronvim.utils"
+vim.filetype.add { extension = { hx = "haxe" } }
+
 return {
   "nvim-treesitter/nvim-treesitter",
   optional = true,
-  dependencies = {
-    {
-      "vantreeseba/tree-sitter-haxe",
-      build = "cp -r queries ../nvim-treesitter/queries/haxe",
-      init = function() vim.filetype.add { extension = { hx = "haxe" } } end,
-      config = function()
-        require("nvim-treesitter.parsers").get_parser_configs().haxe = {
-          install_info = { url = vim.fn.stdpath "data" .. "/lazy/tree-sitter-haxe", files = { "src/parser.c" } },
-          filetype = "haxe",
-        }
-      end,
-    },
-  },
-  opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "haxe") end,
+  opts = function(_, opts)
+    local parser_config = require("nvim-treesitter.parsers").get_parser_configs()
+
+    parser_config.haxe = {
+      install_info = {
+        url = "https://github.com/vantreeseba/tree-sitter-haxe",
+        files = { "src/parser.c" },
+        branch = "main",
+      },
+      filetype = "haxe",
+    }
+
+    opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, "haxe")
+  end,
 }
diff --git a/lua/astrocommunity/pack/helm/init.lua b/lua/astrocommunity/pack/helm/init.lua
@@ -4,23 +4,25 @@ return {
   {
     "nvim-treesitter/nvim-treesitter",
     optional = true,
-    dependencies = {
-      {
-        "ngalaiko/tree-sitter-go-template",
-        config = function()
-          require("nvim-treesitter.parsers").get_parser_configs().gotmpl = {
-            install_info = {
-              url = vim.fn.stdpath "data" .. "/lazy/tree-sitter-go-template",
-              files = { "src/parser.c" },
-            },
-            filetype = "helm",
-          }
-        end,
-      },
-    },
+    opts = function(_, opts)
+      local parser_config = require("nvim-treesitter.parsers").get_parser_configs()
+
+      parser_config.gotmpl = {
+        install_info = {
+          url = "https://github.com/ngalaiko/tree-sitter-go-template",
+          files = { "src/parser.c" },
+          branch = "main",
+        },
+        filetype = "gotmpl",
+      }
+      vim.treesitter.language.register("gotmpl", "helm")
+
+      opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, "gotmpl")
+    end,
   },
   {
     "williamboman/mason-lspconfig.nvim",
+    optional = true,
     opts = function(_, opts)
       opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "helm_ls")
 

diff --git a/lua/astrocommunity/pack/just/init.lua b/lua/astrocommunity/pack/just/init.lua
@@ -1,17 +1,29 @@
+vim.filetype.add {
+  extension = { just = "just" },
+  filename = {
+    justfile = "just",
+    Justfile = "just",
+    [".Justfile"] = "just",
+    [".justfile"] = "just",
+  },
+}
+
 return {
   "nvim-treesitter/nvim-treesitter",
   optional = true,
-  dependencies = {
-    {
-      "IndianBoy42/tree-sitter-just",
-      config = function()
-        require("nvim-treesitter.parsers").get_parser_configs().just = {
-          install_info = { url = vim.fn.stdpath "data" .. "/lazy/tree-sitter-just", files = { "src/parser.c" } },
-          files = { "src/parser.c", "src/scanner.cc" },
-          branch = "main",
-          -- use_makefile = true -- this may be necessary on MacOS (try if you see compiler errors)
-        }
-      end,
-    },
-  },
+  opts = function(_, opts)
+    local parser_config = require("nvim-treesitter.parsers").get_parser_configs()
+
+    parser_config.just = {
+      install_info = {
+        url = "https://github.com/IndianBoy42/tree-sitter-just",
+        files = { "src/parser.c", "src/scanner.cc" },
+        branch = "main",
+      },
+      filetype = "just",
+      maintainers = { "@IndianBoy42" },
+    }
+
+    opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, "just")
+  end,
 }
diff --git a/lua/astrocommunity/pack/wgsl/init.lua b/lua/astrocommunity/pack/wgsl/init.lua
@@ -3,26 +3,11 @@ return {
   {
     "nvim-treesitter/nvim-treesitter",
     optional = true,
-    dependencies = {
-      {
-        "szebniok/tree-sitter-wgsl",
-        build = "cp -r queries ../nvim-treesitter/queries/wgsl",
-        init = function() vim.filetype.add { extension = { wgsl = "wgsl" } } end,
-        config = function()
-          require("nvim-treesitter.parsers").get_parser_configs().wgsl = {
-            install_info = {
-              url = vim.fn.stdpath "data" .. "/lazy/tree-sitter-wgsl",
-              files = { "src/parser.c", "src/scanner.c" },
-            },
-            filetype = "wgsl",
-          }
-        end,
-      },
-    },
     opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "wgsl") end,
   },
   {
     "williamboman/mason-lspconfig.nvim",
+    optional = true,
     opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "wgsl_analyzer") end,
   },
 }