Skip to content
This repository was archived by the owner on Apr 16, 2024. It is now read-only.

Commit 84b9c9a

Browse files
committed
feat: update mason, use lua_ls language server and fix nvim-lspconfig
1 parent cc06790 commit 84b9c9a

File tree

6 files changed

+10
-8
lines changed

6 files changed

+10
-8
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ return {
233233
```
234234

235235
The same module with be avaliable in your `config.lua` in the `doom.features.module_name` field.
236-
The settings should have autocomplete from sumneko lua lsp.
236+
The settings should have autocomplete from lua lsp.
237237
```lua
238238
-- config.lua
239239
local whichkey = doom.features.whichkey -- Get the whichkey module

doc/doom_nvim.norg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ Some of the defining features that make this project unique are:
157157
@end
158158

159159
The same module with be avaliable in your `config.lua` in the `doom.features.module_name` field.
160-
The settings should have autocomplete from sumneko lua lsp.
160+
The settings should have autocomplete from lua lsp.
161161
@code lua
162162
-- config.lua
163163
local whichkey = doom.features.whichkey -- Get the whichkey module

lazy-lock.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
"leap.nvim": { "branch": "main", "commit": "b6ae80f8fc9993638608fc1a51c6ab0eeb12618c" },
2626
"lsp_signature.nvim": { "branch": "master", "commit": "1979f1118e2b38084e7c148f279eed6e9300a342" },
2727
"lush.nvim": { "branch": "main", "commit": "966aad1accd47fa11fbe2539234f81f678fef2de" },
28+
"mason-lspconfig": { "branch": "main", "commit": "40301e1c74bc0946eece13edf2b1c561cc497491" },
29+
"mason.nvim": { "branch": "main", "commit": "cd7835b15f5a4204fc37e0aa739347472121a54c" },
2830
"mini.cursorword": { "branch": "main", "commit": "21af5679b39cf1a6bc6bf4eeaabc35e1b5ee7110" },
2931
"neodev.nvim": { "branch": "main", "commit": "f3f5d756f4043180523bb69072a104f7216b5f42" },
3032
"neogen": { "branch": "main", "commit": "0958aeffcddf46e57785c3026be934816b4f39d2" },

lua/doom/core/doom_global.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
--
33
-- Sets the `doom` global object including defaults and helper functions.
44
-- We set it directly within this file (rather than returning the object) and
5-
-- setting it elsewhere to allow sumneko_lua to provide documented type
5+
-- setting it elsewhere to allow lua_ls to provide documented type
66
-- completions.
77

88
--- TYPE DEFINITIONS

lua/doom/modules/langs/lua/init.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ lua.settings = {
1313
disable_lsp = false,
1414
--- Name of the language server
1515
--- @type string
16-
lsp_name = "sumneko_lua",
16+
lsp_name = "lua_ls",
1717
--- Custom config to pass to nvim-lspconfig
1818
--- @type table|nil
1919
lsp_config = {
20-
formatter = {
21-
enabled = true,
22-
},
2320
settings = {
2421
Lua = {
22+
format = {
23+
enable = true,
24+
},
2525
completion = {
2626
callSnippet = "Replace",
2727
},

lua/doom/modules/langs/utils.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ module.use_lsp_mason = function(lsp_name, options)
246246
and lsp_config_server.manager.try_add_wrapper
247247
or lsp_config_server.manager.try_add
248248
for _, bufnr in ipairs(vim.api.nvim_list_bufs()) do
249-
buffer_handler(bufnr)
249+
buffer_handler(lsp_config_server.manager, bufnr)
250250
end
251251
end
252252
end

0 commit comments

Comments
 (0)