Skip to content

Commit 41b2a96

Browse files
committed
remove neotree from filetree since it's included now
1 parent f61c78a commit 41b2a96

File tree

2 files changed

+11
-22
lines changed

2 files changed

+11
-22
lines changed

init.lua

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -714,11 +714,11 @@ require('lazy').setup({
714714
},
715715
-- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
716716
diagnostics = { disable = { 'missing-fields' } },
717-
globals = { 'vim' },
718-
},
719-
hint = { enable = true },
717+
globals = { 'vim' },
720718
},
719+
hint = { enable = true },
721720
},
721+
},
722722
ols = {},
723723
}
724724

@@ -741,6 +741,10 @@ require('lazy').setup({
741741
require('mason-lspconfig').setup {
742742
handlers = {
743743
function(server_name)
744+
-- temporary solution based on https://github.com/neovim/nvim-lspconfig/pull/3232#issuecomment-2331025714 until things work correctly
745+
if server_name == 'tsserver' then
746+
server_name = 'ts_ls'
747+
end
744748
local server = servers[server_name] or {}
745749
-- This handles overriding only values explicitly passed
746750
-- by the server configuration above. Useful when disabling
@@ -822,10 +826,10 @@ require('lazy').setup({
822826
-- See the README about individual language/framework/plugin snippets:
823827
-- https://github.com/rafamadriz/friendly-snippets
824828
{
825-
'rafamadriz/friendly-snippets',
826-
config = function()
827-
require('luasnip.loaders.from_vscode').lazy_load()
828-
end,
829+
'rafamadriz/friendly-snippets',
830+
config = function()
831+
require('luasnip.loaders.from_vscode').lazy_load()
832+
end,
829833
},
830834
},
831835
},

lua/custom/plugins/filetree.lua

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)