diff --git a/lua/keymaps.lua b/lua/keymaps.lua index ecceeb54..b103f9c2 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -38,7 +38,7 @@ vim.keymap.set('n', '', '', { desc = 'Move focus to the upper win -- vim.keymap.set("n", "", "J", { desc = "Move window to the lower" }) -- vim.keymap.set("n", "", "K", { desc = "Move window to the upper" }) --- vim.keymap.set('n', 'cf', 'EslintFixAll | w', { desc = 'ESLint Fix All', silent = true }) +-- vim.keymap.set('n', 'cf', 'LspEslintFixAll | w', { desc = 'ESLint Fix All', silent = true }) vim.keymap.set('n', 'cf', 'mF:%!eslint_d --stdin --fix-to-stdout --stdin-filename %`F | w', { desc = 'ESLint Fix All', silent = true }) vim.keymap.set('n', 'tg', 'Neogit', { silent = true, desc = 'Neogit' }) diff --git a/lua/kickstart/plugins/lspconfig.lua b/lua/kickstart/plugins/lspconfig.lua index 25823ed9..079b1e35 100644 --- a/lua/kickstart/plugins/lspconfig.lua +++ b/lua/kickstart/plugins/lspconfig.lua @@ -201,6 +201,42 @@ return { local vue_language_server_path = vim.fn.expand '$MASON/packages' .. '/vue-language-server' .. '/node_modules/@vue/language-server' + local vue_plugin = { + name = '@vue/typescript-plugin', + location = vue_language_server_path, + languages = { 'vue' }, + configNamespace = 'typescript', + } + + local vtsls_config = { + settings = { + typescript = { + tsserver = { + maxTsServerMemory = 8192, + }, + }, + vtsls = { + tsserver = { + globalPlugins = { + vue_plugin, + }, + }, + }, + }, + filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue' }, + } + + local vue_ls_config = { + init_options = { + vue = { + suggest = { + componentNameCasing = 'autoPascal', + propNameCasing = 'autoCamel', + }, + }, + }, + } + -- Enable the following language servers -- Feel free to add/remove any LSPs that you want here. They will automatically be installed. -- @@ -224,54 +260,32 @@ return { -- ts_ls = {}, -- - -- ts_ls = { - -- init_options = { - -- plugins = { - -- { - -- name = '@vue/typescript-plugin', - -- location = vue_language_server_path, - -- languages = { 'vue' }, - -- }, - -- }, - -- }, - -- filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue' }, - -- }, - vtsls = { - filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue' }, - settings = { - vtsls = { - tsserver = { - globalPlugins = { - { - name = '@vue/typescript-plugin', - location = vue_language_server_path, - languages = { 'vue' }, - configNamespace = 'typescript', - enableForWorkspaceTypeScriptVersions = true, - }, - }, - }, - }, - }, - }, - vue_ls = { - init_options = { - vue = { - complete = { - casing = { - tags = 'autoPascal', - props = 'autoCamel', - }, - }, - }, + vtsls = vtsls_config, + vue_ls = vue_ls_config, + oxlint = { + filetypes = { + 'javascript', + 'javascriptreact', + 'javascript.jsx', + 'typescript', + 'typescriptreact', + 'typescript.tsx', + 'vue', }, }, + prettierd = {}, + eslint_d = {}, + stylelint = {}, tailwindcss = {}, + jsonlint = {}, + marksman = {}, + markdownlint = {}, rust_analyzer = { checkOnSave = { command = 'clippy', }, }, + stylua = {}, lua_ls = { -- cmd = { ... }, -- filetypes = { ... }, @@ -302,15 +316,6 @@ return { -- You can add other tools here that you want Mason to install -- for you, so that they are available from within Neovim. local ensure_installed = vim.tbl_keys(servers or {}) - vim.list_extend(ensure_installed, { - 'stylua', -- Used to format Lua code, - 'prettierd', - 'stylelint', - 'eslint_d', - 'oxlint', - 'jsonls', - 'marksman', - }) for serverKey in pairs(servers or {}) do local server = servers[serverKey] diff --git a/lua/lazy-plugins.lua b/lua/lazy-plugins.lua index 60522713..eb213248 100644 --- a/lua/lazy-plugins.lua +++ b/lua/lazy-plugins.lua @@ -55,7 +55,7 @@ require('lazy').setup({ require 'kickstart/plugins.mini', require 'kickstart/plugins.treesitter', - require 'kickstart.plugins.debug', + -- require 'kickstart.plugins.debug', require 'kickstart.plugins.indent_line', require 'kickstart.plugins.lint', require 'kickstart.plugins.autopairs',