From a61051f82b02b060eb4ce0edfdc86976fab886c7 Mon Sep 17 00:00:00 2001 From: Mark Riedesel Date: Wed, 7 Aug 2024 11:14:34 -0500 Subject: [PATCH] hopefully fix typescript checking in vue files --- .config/nvim/lua/klowner/plugins/gen.lua | 6 ++++ .../lua/klowner/plugins/lsp/lspconfig.lua | 32 ++++++++++++++++++- .../nvim/lua/klowner/plugins/lsp/mason.lua | 2 ++ .../plugins/treesitter-textobjects.lua | 14 ++++++++ .../nvim/lua/klowner/plugins/treesitter.lua | 2 ++ 5 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 .config/nvim/lua/klowner/plugins/gen.lua create mode 100644 .config/nvim/lua/klowner/plugins/treesitter-textobjects.lua diff --git a/.config/nvim/lua/klowner/plugins/gen.lua b/.config/nvim/lua/klowner/plugins/gen.lua new file mode 100644 index 0000000..0d5bd3c --- /dev/null +++ b/.config/nvim/lua/klowner/plugins/gen.lua @@ -0,0 +1,6 @@ +return { + "David-Kunz/gen.nvim", + opts = { + model = "mistral", + }, +} diff --git a/.config/nvim/lua/klowner/plugins/lsp/lspconfig.lua b/.config/nvim/lua/klowner/plugins/lsp/lspconfig.lua index c698807..613fe0c 100644 --- a/.config/nvim/lua/klowner/plugins/lsp/lspconfig.lua +++ b/.config/nvim/lua/klowner/plugins/lsp/lspconfig.lua @@ -133,8 +133,38 @@ return { }) end, - lspconfig.gdscript.setup({}) + ["tsserver"] = function () + local mason_registry = require 'mason-registry' + local vue_language_server_path = mason_registry.get_package('vue-language-server'):get_install_path() + + lspconfig['tsserver'].setup({ + init_options = { + plugins = { + { + name = '@vue/typescript-plugin', + location = vue_language_server_path, + languages = { 'vue' }, + }, + }, + }, + }) + end, + + ["volar"] = function () + lspconfig['volar'].setup { + init_options = { + vue = { + hybridMode = false, + }, + }, + filetypes = { + 'vue', + }, + } + end, }) + + lspconfig.gdscript.setup {} end, } diff --git a/.config/nvim/lua/klowner/plugins/lsp/mason.lua b/.config/nvim/lua/klowner/plugins/lsp/mason.lua index 89cd42b..6cbc31e 100644 --- a/.config/nvim/lua/klowner/plugins/lsp/mason.lua +++ b/.config/nvim/lua/klowner/plugins/lsp/mason.lua @@ -21,6 +21,8 @@ return { package_pending = "➜", package_uninstalled = "✗", }, + width = 0.8, + height = 0.9, }, }) diff --git a/.config/nvim/lua/klowner/plugins/treesitter-textobjects.lua b/.config/nvim/lua/klowner/plugins/treesitter-textobjects.lua new file mode 100644 index 0000000..579d0a1 --- /dev/null +++ b/.config/nvim/lua/klowner/plugins/treesitter-textobjects.lua @@ -0,0 +1,14 @@ +return { + "nvim-treesitter/nvim-treesitter-textobjects", + lazy = true, + config = function () + require("nvim-treesitter.configs").setup({ + textobjects = { + select = { + enable = true, + lookahead = true, + }, + }, + }) + end +} diff --git a/.config/nvim/lua/klowner/plugins/treesitter.lua b/.config/nvim/lua/klowner/plugins/treesitter.lua index af5943b..81cd688 100644 --- a/.config/nvim/lua/klowner/plugins/treesitter.lua +++ b/.config/nvim/lua/klowner/plugins/treesitter.lua @@ -4,6 +4,7 @@ return { build = ":TSUpdate", dependencies = { "windwp/nvim-ts-autotag", + "nvim-treesitter/nvim-treesitter-textobjects", }, config = function() -- import nvim-treesitter plugin @@ -11,6 +12,7 @@ return { -- configure treesitter treesitter.setup({ -- enable syntax highlighting + auto_install = true, highlight = { enable = true, },