mirror/LazyVim.LazyVim
1
0
Fork 0
mirror of https://github.com/LazyVim/LazyVim.git synced 2025-06-23 09:18:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(lsp): better way of extending deeply nested lists. Fixes #3398

Browse source
This commit is contained in:
Folke Lemaitre 2024-05-31 13:52:41 +02:00
parent 7782affc90
commit 9f2cc30246
No known key found for this signature in database
GPG key ID: 41F8B1FBACAE2040
3 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lua/lazyvim/plugins/extras/lang/typescript.lua
View file

@ -119,12 +119,6 @@ return {
-- copy typescript settings to javascript
opts.settings.javascript =
vim.tbl_deep_extend("force", {}, opts.settings.typescript, opts.settings.javascript or {})
local plugins = vim.tbl_get(opts.settings, "vtsls", "tsserver", "globalPlugins")
-- allow plugins to have a key for proper merging
-- remove the key here
if plugins then
opts.settings.vtsls.tsserver.globalPlugins = vim.tbl_values(plugins)
end
end,
},
},

20
lua/lazyvim/plugins/extras/lang/vue.lua
View file

@ -27,20 +27,6 @@ return {
-- Volar 2.0 has discontinued their "take over mode" which in previous version provided support for typescript in vue files.
-- The new approach to get typescript support involves using the typescript language server along side volar.
vtsls = {
settings = {
vtsls = {
tsserver = {
globalPlugins = {
-- Use typescript language server along with vue typescript plugin
vue = {
name = "@vue/typescript-plugin",
location = vue_typescript_plugin,
languages = { "vue" },
},
},
},
},
},
filetypes = {
"javascript",
"javascriptreact",
@ -52,6 +38,12 @@ return {
},
},
})
LazyVim.extend(opts.servers.vtsls, "settings.vtsls.tsserver.globalPlugins", {
name = "@vue/typescript-plugin",
location = vue_typescript_plugin,
languages = { "vue" },
})
end,
},
}