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

Commit

Permalink
feat: update mason, use lua_ls language server and fix nvim-lspconfig
Browse files Browse the repository at this point in the history
  • Loading branch information
pauldub committed Oct 29, 2023
1 parent cc06790 commit 84b9c9a
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ return {
```

The same module with be avaliable in your `config.lua` in the `doom.features.module_name` field.
The settings should have autocomplete from sumneko lua lsp.
The settings should have autocomplete from lua lsp.
```lua
-- config.lua
local whichkey = doom.features.whichkey -- Get the whichkey module
Expand Down
2 changes: 1 addition & 1 deletion doc/doom_nvim.norg
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ Some of the defining features that make this project unique are:
@end

The same module with be avaliable in your `config.lua` in the `doom.features.module_name` field.
The settings should have autocomplete from sumneko lua lsp.
The settings should have autocomplete from lua lsp.
@code lua
-- config.lua
local whichkey = doom.features.whichkey -- Get the whichkey module
Expand Down
2 changes: 2 additions & 0 deletions lazy-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
"leap.nvim": { "branch": "main", "commit": "b6ae80f8fc9993638608fc1a51c6ab0eeb12618c" },
"lsp_signature.nvim": { "branch": "master", "commit": "1979f1118e2b38084e7c148f279eed6e9300a342" },
"lush.nvim": { "branch": "main", "commit": "966aad1accd47fa11fbe2539234f81f678fef2de" },
"mason-lspconfig": { "branch": "main", "commit": "40301e1c74bc0946eece13edf2b1c561cc497491" },
"mason.nvim": { "branch": "main", "commit": "cd7835b15f5a4204fc37e0aa739347472121a54c" },
"mini.cursorword": { "branch": "main", "commit": "21af5679b39cf1a6bc6bf4eeaabc35e1b5ee7110" },
"neodev.nvim": { "branch": "main", "commit": "f3f5d756f4043180523bb69072a104f7216b5f42" },
"neogen": { "branch": "main", "commit": "0958aeffcddf46e57785c3026be934816b4f39d2" },
Expand Down
2 changes: 1 addition & 1 deletion lua/doom/core/doom_global.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
--
-- Sets the `doom` global object including defaults and helper functions.
-- We set it directly within this file (rather than returning the object) and
-- setting it elsewhere to allow sumneko_lua to provide documented type
-- setting it elsewhere to allow lua_ls to provide documented type
-- completions.

--- TYPE DEFINITIONS
Expand Down
8 changes: 4 additions & 4 deletions lua/doom/modules/langs/lua/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ lua.settings = {
disable_lsp = false,
--- Name of the language server
--- @type string
lsp_name = "sumneko_lua",
lsp_name = "lua_ls",
--- Custom config to pass to nvim-lspconfig
--- @type table|nil
lsp_config = {
formatter = {
enabled = true,
},
settings = {
Lua = {
format = {
enable = true,
},
completion = {
callSnippet = "Replace",
},
Expand Down
2 changes: 1 addition & 1 deletion lua/doom/modules/langs/utils.lua
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ module.use_lsp_mason = function(lsp_name, options)
and lsp_config_server.manager.try_add_wrapper
or lsp_config_server.manager.try_add
for _, bufnr in ipairs(vim.api.nvim_list_bufs()) do
buffer_handler(bufnr)
buffer_handler(lsp_config_server.manager, bufnr)
end
end
end
Expand Down

0 comments on commit 84b9c9a

Please sign in to comment.