fix nvim-treesitter

init.lua

@@ -428,13 +428,16 @@ require("lazy").setup({
 							},
 						},
 					},
-					denols = {
-						root_dir = util.root_pattern("deno.jsonc", "deno.json"),
-						single_file_support = false,
-					},
 					-- ts_ls = {
+					-- 	root_dir = util.root_pattern({ "package.json", "tsconfig.json" }),
 					-- 	single_file_support = false,
+					-- 	settings = {},
 					-- },
+					denols = {
+						root_dir = util.root_pattern({ "deno.json", "deno.jsonc" }),
+						single_file_support = false,
+						settings = {},
+					},
 				}
 
 				-- Ensure the servers and tools above are installed
@@ -518,9 +521,9 @@ require("lazy").setup({
 					--
 					-- You can use 'stop_after_first' to run the first available formatter from the list
 					-- javascript = { "prettierd", "prettier", stop_after_first = true },
-					css = { "deno_fmt" },
+					-- css = { "deno_fmt" },
 					-- html = { "deno_fmt" },
-					json = { "deno_fmt" },
+					-- json = { "deno_fmt" },
 				},
 			},
 		},
@@ -653,41 +656,44 @@ require("lazy").setup({
 		},
 
 		{
-			"nvim-treesitter/nvim-treesitter",
+			-- Archived upstream:
+			-- "nvim-treesitter/nvim-treesitter",
+
+			"sfja2004/nvim-treesitter-legacy",
+			name = "nvim-treesitter",
+
+			-- Local:
+			-- dir = "~/Workspace/nvim-treesitter-legacy",
+			-- name = "nvim-treesitter",
 			build = ":TSUpdate",
-			branch = "master",
-			lazy = false,
-			opts = {
-				ensure_installed = {
-					"c",
-					"cpp",
-					"lua",
-					"vim",
-					"vimdoc",
-					"query",
-					"javascript",
-					"html",
-					"markdown",
-					"css",
-					"typescript",
-					"json",
-					"rust",
-				},
-				auto_install = true,
-				modules = {},
-				ignore_install = {},
-				sync_install = false,
-				highlight = { enable = true },
-				indent = { enable = false },
-			},
-			main = "nvim-treesitter.configs",
-			config = function(_, opts)
-				-- Protective call: If treesitter fails to load, don't crash neovim
-				local status_ok, configs = pcall(require, "nvim-treesitter.configs")
-				if not status_ok then
-					return
-				end
-				configs.setup(opts)
+			config = function()
+				local configs = require("nvim-treesitter.configs")
+
+				configs.setup({
+					ensure_installed = {
+						"c",
+						"cpp",
+						"lua",
+						"vim",
+						"vimdoc",
+						"query",
+						"javascript",
+						"html",
+						"markdown",
+						"css",
+						"typescript",
+						"json",
+						"rust",
+					},
+					auto_install = false,
+					modules = {},
+					ignore_install = {},
+					sync_install = false,
+					highlight = {
+						enable = true,
+					},
+					indent = { enable = false },
+				})
 			end,
 		},
 
@@ -729,11 +735,10 @@ require("lazy").setup({
 			requires = { "neovim/nvim-lspconfig", "MunifTanjim/nui.nvim" },
 		},
 
-		{
-			dir = "~/Workspace/slige/editors/vim/",
-			name = "slige",
-		},
-		{ dir = "/home/simone/Workspace/cjsongen/parse/vim", name = "cjsongen" },
+		{ dir = "~/Workspace/slige/editors/vim/", name = "slige" },
+		{ dir = "~/Workspace/cjsongen/parse/vim/", name = "cjsongen" },
+		{ dir = "~/Workspace/phi-lang/vim/", name = "phi" },
+		{ dir = "~/Workspace/vc5/vim", name = "vc5asm" },
 
 		-- Plugins done
 	},

lazy-lock.json

@@ -1,25 +1,25 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "642b0c595e11608b4c18219e93b88d7637af27bc" },
+  "LuaSnip": { "branch": "master", "commit": "a62e1083a3cfe8b6b206e7d3d33a51091df25357" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
   "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
   "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" },
-  "fidget.nvim": { "branch": "main", "commit": "7fa433a83118a70fe24c1ce88d5f0bd3453c0970" },
-  "gitsigns.nvim": { "branch": "main", "commit": "5310a7f3a97b6de629269f8935691627a076ae4b" },
+  "fidget.nvim": { "branch": "main", "commit": "889e2e96edef4e144965571d46f7a77bcc4d0ddf" },
+  "gitsigns.nvim": { "branch": "main", "commit": "0d797daee85366bc242580e352a4f62d67557b84" },
   "gruvbox.nvim": { "branch": "main", "commit": "334d5fd49fc8033f26408425366c66c6390c57bb" },
-  "idris2-nvim": { "branch": "main", "commit": "19dcf61737293365c23c890ca622fa34aeb12780" },
+  "idris2-nvim": { "branch": "main", "commit": "ec0fb7f22feeaa8d454e2b11675ae4c493228833" },
   "indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" },
   "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
   "lazydev.nvim": { "branch": "main", "commit": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d" },
-  "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
+  "lualine.nvim": { "branch": "master", "commit": "8811f3f3f4dc09d740c67e9ce399e7a541e2e5b2" },
   "luvit-meta": { "branch": "main", "commit": "cc9b2d412d2fbd30b94a70cfc214c2a3be27a0a2" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "a979821a975897b88493843301950c456a725982" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "25f609e7fca78af7cede4f9fa3af8a94b1c4950b" },
   "mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" },
-  "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
+  "mason.nvim": { "branch": "main", "commit": "b03fb0f20bc1d43daf558cda981a2be22e73ac42" },
   "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" },
-  "nvim-lspconfig": { "branch": "master", "commit": "46204c8fdaa36a9aa3768780450e4bc7a210025f" },
-  "nvim-treesitter": { "branch": "master", "commit": "cf12346a3414fa1b06af75c79faebe7f76df080a" },
-  "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" },
+  "nvim-lspconfig": { "branch": "master", "commit": "bedca8b426b2fee0ccac596d167d71bbe971253f" },
+  "nvim-treesitter": { "branch": "master", "commit": "15b6addcf95274d04f82c809930dd0e5ce6787d3" },
+  "nvim-web-devicons": { "branch": "master", "commit": "95b7a002d5dba1a42eb58f5fac5c565a485eefd0" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },