Skip to content

Commit ac1997c

Browse files
[~] Downgraded to python 3.13.12 due to nvim compatibility issues
updated lsp and treesitter configs to work with new versions of lspconfig and nvim-treesitter
1 parent 4a37cf3 commit ac1997c

3 files changed

Lines changed: 35 additions & 24 deletions

File tree

mise/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ lua = "5.5.0"
77
maven = "3.6.3"
88
node = "24.14.0"
99
opam = "2.1.2"
10-
python = "3.14.3"
10+
python = "3.13.12"
1111
ruby = "4.0.2"
1212
rust = "1.94.0"
1313
gradle = "6.8.1"

nvim/lua/missingcharacter/lazy/lsp.lua

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,24 @@ return {
1717
local cmp = require("cmp")
1818
local cmp_lsp = require("cmp_nvim_lsp")
1919
local capabilities = vim.tbl_deep_extend("force", {}, vim.lsp.protocol.make_client_capabilities(), cmp_lsp.default_capabilities())
20-
local lspconfig = require("lspconfig")
21-
-- `mason-lspconfig` does not support mojo
22-
lspconfig.mojo.setup({
20+
local util = require("lspconfig.util")
21+
vim.lsp.config("mojo", {
22+
cmd = { "mojo-lsp-server" },
23+
root_dir = util.find_git_ancestor,
24+
single_file_support = true,
2325
capabilities = capabilities,
26+
on_attach = function(client, bufnr)
27+
on_attach(client, bufnr)
28+
vim.keymap.set("n", "<leader>fmt", function()
29+
vim.cmd("noa silent !mojo format --quiet " .. vim.fn.expand("%:p"))
30+
end) -- manually format document
31+
end,
32+
filetypes = { "mojo", "*.🔥" },
2433
})
34+
-- `mason-lspconfig` does not support mojo
35+
--lspconfig.mojo.setup({
36+
-- capabilities = capabilities,
37+
--})
2538
require("fidget").setup({})
2639
require("mason").setup()
2740
require("mason-lspconfig").setup({

nvim/lua/missingcharacter/lazy/treesitter.lua

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,9 @@
11
return {
22
"nvim-treesitter/nvim-treesitter",
3+
lazy = false,
34
build = ":TSUpdate",
45
config = function()
5-
require("nvim-treesitter.configs").setup({
6-
-- A list of parser names, or "all"
7-
ensure_installed = {
8-
"bash",
9-
"c",
10-
"javascript",
11-
"jsdoc",
12-
"lua",
13-
"markdown",
14-
"markdown_inline",
15-
"query",
16-
"regex",
17-
"rust",
18-
"typescript",
19-
"vim",
20-
"vimdoc",
21-
},
22-
6+
require("nvim-treesitter").setup({
237
ignore_install = {},
248
modules = {},
259

@@ -43,8 +27,22 @@ return {
4327
additional_vim_regex_highlighting = { "markdown" },
4428
},
4529
})
46-
local treesitter_parser_config = require("nvim-treesitter.parsers").get_parser_configs()
47-
treesitter_parser_config.templ = {
30+
require("nvim-treesitter").install({
31+
"bash",
32+
"c",
33+
"javascript",
34+
"jsdoc",
35+
"lua",
36+
"markdown",
37+
"markdown_inline",
38+
"query",
39+
"regex",
40+
"rust",
41+
"typescript",
42+
"vim",
43+
"vimdoc",
44+
})
45+
require("nvim-treesitter.parsers").templ = {
4846
install_info = {
4947
url = "https://github.com/vrischmann/tree-sitter-templ.git",
5048
files = { "src/parser.c", "src/scanner.c" },

0 commit comments

Comments
 (0)