diff --git a/lua/lazyvim/config/options.lua b/lua/lazyvim/config/options.lua index 13ed0e96..5c66966a 100644 --- a/lua/lazyvim/config/options.lua +++ b/lua/lazyvim/config/options.lua @@ -49,11 +49,6 @@ vim.g.bigfile_size = 1024 * 1024 * 1.5 -- 1.5 MB -- Show the current document symbols location from Trouble in lualine vim.g.trouble_lualine = true --- Enable hybrid mode for Vue files --- If the hybrid mode is enabled, a sperate vtsls will run for Vue files --- If the hybrid mode is disabled, volar will run a tsserver under the hood -vim.g.vue_hybrid_mode = true - local opt = vim.opt opt.autowrite = true -- Enable auto write diff --git a/lua/lazyvim/plugins/extras/lang/vue.lua b/lua/lazyvim/plugins/extras/lang/vue.lua index 69223014..cd2fe4f1 100644 --- a/lua/lazyvim/plugins/extras/lang/vue.lua +++ b/lua/lazyvim/plugins/extras/lang/vue.lua @@ -1,5 +1,3 @@ -local enableHybridMode = vim.g.vue_hybrid_mode - return { recommended = function() return LazyVim.extras.wants({ @@ -24,7 +22,7 @@ return { volar = { init_options = { vue = { - hybridMode = enableHybridMode, + hybridMode = false, }, }, }, @@ -37,18 +35,16 @@ return { { "neovim/nvim-lspconfig", opts = function(_, opts) - if enableHybridMode then - table.insert(opts.servers.vtsls.filetypes, "vue") - LazyVim.extend(opts.servers.vtsls, "settings.vtsls.tsserver.globalPlugins", { - { - name = "@vue/typescript-plugin", - location = LazyVim.get_pkg_path("vue-language-server", "/node_modules/@vue/language-server"), - languages = { "vue" }, - configNamespace = "typescript", - enableForWorkspaceTypeScriptVersions = true, - }, - }) - end + table.insert(opts.servers.vtsls.filetypes, "vue") + LazyVim.extend(opts.servers.vtsls, "settings.vtsls.tsserver.globalPlugins", { + { + name = "@vue/typescript-plugin", + location = LazyVim.get_pkg_path("vue-language-server", "/node_modules/@vue/language-server"), + languages = { "vue" }, + configNamespace = "typescript", + enableForWorkspaceTypeScriptVersions = true, + }, + }) end, }, }