From c09e32063366c2061f4ea5220f9a0a5f08708eba Mon Sep 17 00:00:00 2001 From: Pojok Code Date: Sun, 20 Oct 2024 17:21:07 +0700 Subject: [PATCH] enc: move lsp config to auto-lsp.nvim --- lazy-lock.json | 3 +- lua/plugins/_lsp.lua | 64 +--- lua/plugins/java.lua | 57 ++-- lua/plugins/rust.lua | 6 +- lua/user/lsp/config.lua | 66 ++-- lua/user/lsp/handlers.lua | 294 +++++++++--------- .../{settings => settings_backup}/clangd.lua | 0 .../{settings => settings_backup}/denols.lua | 0 .../emmet_ls.lua | 0 .../{settings => settings_backup}/eslint.lua | 0 .../intelephense.lua | 0 .../{settings => settings_backup}/jdtls.lua | 0 .../{settings => settings_backup}/jsonls.lua | 38 +-- .../kotlin_language_server.lua | 0 .../{settings => settings_backup}/lua_ls.lua | 0 .../{settings => settings_backup}/pyright.lua | 18 +- .../{settings => settings_backup}/sqlls.lua | 0 .../stimulus_ls.lua | 0 .../tailwindcss.lua | 0 .../tsserver.lua | 0 .../{settings => settings_backup}/vuels.lua | 0 .../{settings => settings_backup}/yamlls.lua | 0 22 files changed, 253 insertions(+), 293 deletions(-) rename lua/user/lsp/{settings => settings_backup}/clangd.lua (100%) rename lua/user/lsp/{settings => settings_backup}/denols.lua (100%) rename lua/user/lsp/{settings => settings_backup}/emmet_ls.lua (100%) rename lua/user/lsp/{settings => settings_backup}/eslint.lua (100%) rename lua/user/lsp/{settings => settings_backup}/intelephense.lua (100%) rename lua/user/lsp/{settings => settings_backup}/jdtls.lua (100%) rename lua/user/lsp/{settings => settings_backup}/jsonls.lua (94%) rename lua/user/lsp/{settings => settings_backup}/kotlin_language_server.lua (100%) rename lua/user/lsp/{settings => settings_backup}/lua_ls.lua (100%) rename lua/user/lsp/{settings => settings_backup}/pyright.lua (92%) rename lua/user/lsp/{settings => settings_backup}/sqlls.lua (100%) rename lua/user/lsp/{settings => settings_backup}/stimulus_ls.lua (100%) rename lua/user/lsp/{settings => settings_backup}/tailwindcss.lua (100%) rename lua/user/lsp/{settings => settings_backup}/tsserver.lua (100%) rename lua/user/lsp/{settings => settings_backup}/vuels.lua (100%) rename lua/user/lsp/{settings => settings_backup}/yamlls.lua (100%) diff --git a/lazy-lock.json b/lazy-lock.json index 9f48b2e..33e797f 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -5,6 +5,7 @@ "alpha-nvim": { "branch": "main", "commit": "bf3c8bb8c02ed3d9644cc5bbc48e2bdc39349cd7" }, "auto-conform.nvim": { "branch": "main", "commit": "d04389f955dd0990e85a269b226199f458de32a6" }, "auto-lint.nvim": { "branch": "main", "commit": "aff13cb8eaa055e66e940d43b7d83166397e5413" }, + "auto-lsp.nvim": { "branch": "main", "commit": "420bd7165d0afd396e05a3ad67ae228c36e2f044" }, "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" }, "bufferline.nvim": { "branch": "main", "commit": "0b2fd861eee7595015b6561dade52fb060be10c4" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -40,7 +41,7 @@ "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" }, "nvim-scrollview": { "branch": "main", "commit": "bc37a942debe191fffd072f0f1f2ec7c56c54b17" }, "nvim-tree.lua": { "branch": "master", "commit": "4a9e82d10a3715d0c3845e1d2f66ddfb8b711253" }, - "nvim-treesitter": { "branch": "master", "commit": "68b2bdd99d889e9705f7e90ae64d990f3ff03cf3" }, + "nvim-treesitter": { "branch": "master", "commit": "a3ca2e60563064cea008555d0b7d031430305b09" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "0d79d169fcd45a8da464727ac893044728f121d4" }, "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "9c74db656c3d0b1c4392fc89a016b1910539e7c0" }, diff --git a/lua/plugins/_lsp.lua b/lua/plugins/_lsp.lua index 771be48..b0cebaf 100644 --- a/lua/plugins/_lsp.lua +++ b/lua/plugins/_lsp.lua @@ -1,8 +1,9 @@ return { { - "williamboman/mason-lspconfig.nvim", + "pojokcodeid/auto-lsp.nvim", event = { "VeryLazy", "BufReadPre", "BufNewFile", "BufRead" }, dependencies = { + { "williamboman/mason-lspconfig.nvim" }, { "neovim/nvim-lspconfig", lazy = true, @@ -72,66 +73,13 @@ return { vim.list_extend(opts.ensure_installed, servers) vim.list_extend(opts.skip_config, unregis_lsp) opts.automatic_installation = true + opts.format_on_save = pcode.format_on_save or false -- config format on save none-ls + opts.virtual_text = pcode.lsp_virtualtext or false + opts.timeout_ms = pcode.format_timeout_ms or 5000 return opts end, config = function(_, opts) - require("mason-lspconfig").setup(opts) - - local option = {} - require("mason-lspconfig").setup_handlers({ - function(server_name) -- default handler (optional) - local capabilities = require("user.lsp.handlers").capabilities - if server_name == "clangd" then - capabilities.offsetEncoding = { "utf-16" } - end - local is_skip = false - local my_index = idxOf(opts.skip_config, server_name) - if my_index ~= nil then - is_skip = true - end - if not is_skip then - option = { - on_attach = require("user.lsp.handlers").on_attach, - capabilities = capabilities, - } - - server_name = vim.split(server_name, "@")[1] - - local require_ok, conf_opts = pcall(require, "user.lsp.settings." .. server_name) - if require_ok then - option = vim.tbl_deep_extend("force", conf_opts, option) - end - require("lspconfig")[server_name].setup(option) - end - end, - -- ["jdtls"] = function() - -- require("lspconfig").jdtls.setup({ - -- on_attach = require("user.lsp.handlers").on_attach, - -- capabilities = require("user.lsp.handlers").capabilities, - -- cmd = { - -- "jdtls", - -- "-configuration", - -- vim.fn.expand("$HOME") .. "/.cache/jdtls/config", - -- "-data", - -- vim.fn.expand("$HOME") .. "/.cache/jdtls/workspace", - -- }, - -- filetypes = { "java" }, - -- root_dir = require("lspconfig.util").root_pattern( - -- -- Single-module projects - -- { - -- "build.xml", -- Ant - -- "pom.xml", -- Maven - -- "settings.gradle", -- Gradle - -- "settings.gradle.kts", -- Gradle - -- }, - -- -- Multi-module projects - -- { "build.gradle", "build.gradle.kts" } - -- ) or vim.fn.getcwd(), - -- singe_file_support = true, - -- }) - -- end, - }) - require("user.lsp.handlers").setup() + require("auto-lsp").setup(opts) end, keys = { { "l", "", desc = "  LSP", mode = "n" }, diff --git a/lua/plugins/java.lua b/lua/plugins/java.lua index 600ac10..7e350aa 100644 --- a/lua/plugins/java.lua +++ b/lua/plugins/java.lua @@ -117,7 +117,8 @@ if pcode.active_java_config.active then }, settings = opts.settings, -- enable CMP capabilities - capabilities = require("user.lsp.handlers").capabilities or nil, + -- capabilities = require("user.lsp.handlers").capabilities or nil, + capabilities = require("auto-lsp.lsp.handlers").capabilities or nil, }, opts.jdtls) -- Existing server will be reused if the root_dir matches. @@ -138,31 +139,39 @@ if pcode.active_java_config.active then local client = vim.lsp.get_client_by_id(args.data.client_id) if client and client.name == "jdtls" then local wk = require("which-key") - wk.register({ - ["c"] = { name = "+code" }, - ["cx"] = { name = "+extract" }, - ["cxv"] = { require("jdtls").extract_variable_all, "Extract Variable" }, - ["cxc"] = { require("jdtls").extract_constant, "Extract Constant" }, - ["gs"] = { require("jdtls").super_implementation, "Goto Super" }, - ["co"] = { require("jdtls").organize_imports, "Organize Imports" }, - }, { mode = "n", buffer = args.buf }) - wk.register({ - ["c"] = { name = "+code" }, - ["cx"] = { name = "+extract" }, - ["cxm"] = { - [[lua require('jdtls').extract_method(true)]], - "Extract Method", + wk.add({ + { + mode = "n", + buffer = args.buf, + { "cx", group = "extract" }, + { "cxv", require("jdtls").extract_variable_all, desc = "Extract Variable" }, + { "cxc", require("jdtls").extract_constant, desc = "Extract Constant" }, + { "gs", require("jdtls").super_implementation, desc = "Goto Super" }, + { "co", require("jdtls").organize_imports, desc = "Organize Imports" }, }, - ["cxv"] = { - [[lua require('jdtls').extract_variable_all(true)]], - "Extract Variable", + }) + wk.add({ + { + mode = "v", + buffer = args.buf, + { "cx", group = "extract" }, + { + "cxm", + [[lua require('jdtls').extract_method(true)]], + desc = "Extract Method", + }, + { + "cxv", + [[lua require('jdtls').extract_variable_all(true)]], + desc = "Extract Variable", + }, + { + "cxc", + [[lua require('jdtls').extract_constant(true)]], + desc = "Extract Constant", + }, }, - ["cxc"] = { - [[lua require('jdtls').extract_constant(true)]], - "Extract Constant", - }, - }, { mode = "v", buffer = args.buf }) - + }) if opts.dap and mason_registry.is_installed("java-debug-adapter") then -- custom init for Java debugger require("jdtls").setup_dap(opts.dap) diff --git a/lua/plugins/rust.lua b/lua/plugins/rust.lua index 9e39df9..879c364 100644 --- a/lua/plugins/rust.lua +++ b/lua/plugins/rust.lua @@ -52,8 +52,10 @@ if pcode.active_rust_config then ft = { "rust" }, dependencies = "neovim/nvim-lspconfig", config = function() - local on_attach = require("user.lsp.handlers").on_attach - local capabilities = require("user.lsp.handlers").capabilities + -- local on_attach = require("user.lsp.handlers").on_attach + -- local capabilities = require("user.lsp.handlers").capabilities + local on_attach = require("auto-lsp.lsp.handlers").on_attach + local capabilities = require("auto-lsp.lsp.handlers").capabilities vim.g.rustaceanvim = { server = { diff --git a/lua/user/lsp/config.lua b/lua/user/lsp/config.lua index 5fc2811..d4fe5c7 100644 --- a/lua/user/lsp/config.lua +++ b/lua/user/lsp/config.lua @@ -1,34 +1,34 @@ -local status_ok, lsp_installer = pcall(require, "nvim-lsp-installer") -if not status_ok then - return -end - -local lspconfig = require("lspconfig") - --- local servers = { "jsonls", "sumneko_lua","html","cssls","tsserver"} --- local servers = { "jdtls", "yamlls" } -local servers = {} -local installer = pcode.lsp_installer or {} -for _, client in pairs(installer) do - table.insert(servers, client) -end - -lsp_installer.setup({ - ensure_installed = servers, -}) - -for _, server in pairs(servers) do - local opts = { - on_attach = require("user.lsp.handlers").on_attach, - capabilities = require("user.lsp.handlers").capabilities, - } - local has_custom_opts, server_custom_opts = pcall(require, "user.lsp.settings." .. server) - if has_custom_opts then - opts = vim.tbl_deep_extend("force", opts, server_custom_opts) - end - lspconfig[server].setup(opts) -end - --- lspconfig.yamlls.setup({ --- fletype = { "yaml", "yaml.docker-compose" }, +-- local status_ok, lsp_installer = pcall(require, "nvim-lsp-installer") +-- if not status_ok then +-- return +-- end +-- +-- local lspconfig = require("lspconfig") +-- +-- -- local servers = { "jsonls", "sumneko_lua","html","cssls","tsserver"} +-- -- local servers = { "jdtls", "yamlls" } +-- local servers = {} +-- local installer = pcode.lsp_installer or {} +-- for _, client in pairs(installer) do +-- table.insert(servers, client) +-- end +-- +-- lsp_installer.setup({ +-- ensure_installed = servers, -- }) +-- +-- for _, server in pairs(servers) do +-- local opts = { +-- on_attach = require("user.lsp.handlers").on_attach, +-- capabilities = require("user.lsp.handlers").capabilities, +-- } +-- local has_custom_opts, server_custom_opts = pcall(require, "user.lsp.settings." .. server) +-- if has_custom_opts then +-- opts = vim.tbl_deep_extend("force", opts, server_custom_opts) +-- end +-- lspconfig[server].setup(opts) +-- end +-- +-- -- lspconfig.yamlls.setup({ +-- -- fletype = { "yaml", "yaml.docker-compose" }, +-- -- }) diff --git a/lua/user/lsp/handlers.lua b/lua/user/lsp/handlers.lua index 7b9b5ac..4276cbd 100644 --- a/lua/user/lsp/handlers.lua +++ b/lua/user/lsp/handlers.lua @@ -1,147 +1,147 @@ -local M = {} - -local status_cmp_ok, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp") -if not status_cmp_ok then - return -end - -local lspvitualtext = pcode.lsp_virtualtext or false -local icons = pcode.icons - -M.capabilities = vim.lsp.protocol.make_client_capabilities() -M.capabilities.textDocument.completion.completionItem.snippetSupport = true -M.capabilities = cmp_nvim_lsp.default_capabilities(M.capabilities) - -M.setup = function() - local signs = { - { name = "DiagnosticSignError", text = icons.diagnostics.Error }, - { name = "DiagnosticSignWarn", text = icons.diagnostics.Warning }, - { name = "DiagnosticSignHint", text = icons.diagnostics.Hint }, - { name = "DiagnosticSignInfo", text = icons.diagnostics.Info }, - } - - for _, sign in ipairs(signs) do - vim.fn.sign_define(sign.name, { texthl = sign.name, text = sign.text, numhl = "" }) - end - - local config = { - virtual_text = lspvitualtext, -- disable virtual text - signs = { - active = signs, -- show signs - }, - update_in_insert = true, - underline = true, - severity_sort = true, - float = { - focusable = true, - style = "minimal", - border = "rounded", - source = "always", - header = "", - prefix = "", - }, - } - - vim.diagnostic.config(config) - - vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { - border = "rounded", - }) - - vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, { - border = "rounded", - }) -end - -local function attach_navic(client, bufnr) - vim.g.navic_silence = true - local status_ok, navic = pcall(require, "nvim-navic") - if not status_ok then - return - end - navic.attach(client, bufnr) -end - -function FORMAT_FILTER(client) - local filetype = vim.bo.filetype - local n = require("null-ls") - local s = require("null-ls.sources") - local method = n.methods.FORMATTING - local available_formatters = s.get_available(filetype, method) - - if #available_formatters > 0 then - return client.name == "null-ls" - elseif client.supports_method("textDocument/formatting") then - return true - else - return false - end -end - --- stylua: ignore -local function lsp_keymaps(bufnr, on_save) - local opts = { noremap = true, silent = true } - local keymap = vim.api.nvim_buf_set_keymap - keymap(bufnr, "n", "gD", "lua vim.lsp.buf.declaration()", opts) - keymap(bufnr, "n", "gd", "lua vim.lsp.buf.definition()", opts) - keymap(bufnr, "n", "K", "lua vim.lsp.buf.hover()", opts) - keymap(bufnr, "n", "gI", "lua vim.lsp.buf.implementation()", opts) - keymap(bufnr, "n", "gr", "lua vim.lsp.buf.references()", opts) - keymap(bufnr, "n", "gl", "lua vim.diagnostic.open_float()", opts) - keymap(bufnr, "n", "lf", "lua vim.lsp.buf.format{ async = true }", opts) - keymap(bufnr, "n", "li", "LspInfo", opts) - keymap(bufnr, "n", "lI", "Mason", opts) - keymap(bufnr, "n", "la", "lua vim.lsp.buf.code_action()", opts) - keymap(bufnr, "n", "lj", "lua vim.diagnostic.goto_next({buffer=0})", opts) - keymap(bufnr, "n", "lk", "lua vim.diagnostic.goto_prev({buffer=0})", opts) - keymap(bufnr, "n", "lr", "lua vim.lsp.buf.rename()", opts) - keymap(bufnr, "n", "ls", "lua vim.lsp.buf.signature_help()", opts) - keymap(bufnr, "n", "lq", "lua vim.diagnostic.setloclist()", opts) - if on_save then - local augroup = vim.api.nvim_create_augroup("LspFormatting", {}) - vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr }) - vim.api.nvim_create_autocmd("BufWritePre", { - group = augroup, - buffer = bufnr, - callback = function() - vim.lsp.buf.format({ bufnr = bufnr, timeout_ms = pcode.format_timeout_ms or 5000, filter = FORMAT_FILTER }) - end, - }) - else - vim.schedule(function() - pcall(function() - vim.api.nvim_clear_autocmds({ group = "LspFormatting" }) - end) - end) - end -end -M.on_attach = function(client, bufnr) - attach_navic(client, bufnr) - if client.name == "tsserver" then - client.server_capabilities.documentFormattingProvider = false - end - - if client.name == "lua_ls" then - client.server_capabilities.documentFormattingProvider = false - end - - if client.supports_method("textDocument/inlayHint") then - -- vim.lsp.inlay_hint.enable(bufnr, true) - vim.lsp.inlay_hint.enable(true) - end - - local on_save = pcode.format_on_save or false - -- disable if conform active - local status, _ = pcall(require, "conform") - if status then - on_save = false - end - lsp_keymaps(bufnr, on_save) - local status_ok, illuminate = pcall(require, "illuminate") - if not status_ok then - return - end - illuminate.on_attach(client) -end - -return M +-- local M = {} +-- +-- local status_cmp_ok, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp") +-- if not status_cmp_ok then +-- return +-- end +-- +-- local lspvitualtext = pcode.lsp_virtualtext or false +-- local icons = pcode.icons +-- +-- M.capabilities = vim.lsp.protocol.make_client_capabilities() +-- M.capabilities.textDocument.completion.completionItem.snippetSupport = true +-- M.capabilities = cmp_nvim_lsp.default_capabilities(M.capabilities) +-- +-- M.setup = function() +-- local signs = { +-- { name = "DiagnosticSignError", text = icons.diagnostics.Error }, +-- { name = "DiagnosticSignWarn", text = icons.diagnostics.Warning }, +-- { name = "DiagnosticSignHint", text = icons.diagnostics.Hint }, +-- { name = "DiagnosticSignInfo", text = icons.diagnostics.Info }, +-- } +-- +-- for _, sign in ipairs(signs) do +-- vim.fn.sign_define(sign.name, { texthl = sign.name, text = sign.text, numhl = "" }) +-- end +-- +-- local config = { +-- virtual_text = lspvitualtext, -- disable virtual text +-- signs = { +-- active = signs, -- show signs +-- }, +-- update_in_insert = true, +-- underline = true, +-- severity_sort = true, +-- float = { +-- focusable = true, +-- style = "minimal", +-- border = "rounded", +-- source = "always", +-- header = "", +-- prefix = "", +-- }, +-- } +-- +-- vim.diagnostic.config(config) +-- +-- vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { +-- border = "rounded", +-- }) +-- +-- vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, { +-- border = "rounded", +-- }) +-- end +-- +-- local function attach_navic(client, bufnr) +-- vim.g.navic_silence = true +-- local status_ok, navic = pcall(require, "nvim-navic") +-- if not status_ok then +-- return +-- end +-- navic.attach(client, bufnr) +-- end +-- +-- function FORMAT_FILTER(client) +-- local filetype = vim.bo.filetype +-- local n = require("null-ls") +-- local s = require("null-ls.sources") +-- local method = n.methods.FORMATTING +-- local available_formatters = s.get_available(filetype, method) +-- +-- if #available_formatters > 0 then +-- return client.name == "null-ls" +-- elseif client.supports_method("textDocument/formatting") then +-- return true +-- else +-- return false +-- end +-- end +-- +-- -- stylua: ignore +-- local function lsp_keymaps(bufnr, on_save) +-- local opts = { noremap = true, silent = true } +-- local keymap = vim.api.nvim_buf_set_keymap +-- keymap(bufnr, "n", "gD", "lua vim.lsp.buf.declaration()", opts) +-- keymap(bufnr, "n", "gd", "lua vim.lsp.buf.definition()", opts) +-- keymap(bufnr, "n", "K", "lua vim.lsp.buf.hover()", opts) +-- keymap(bufnr, "n", "gI", "lua vim.lsp.buf.implementation()", opts) +-- keymap(bufnr, "n", "gr", "lua vim.lsp.buf.references()", opts) +-- keymap(bufnr, "n", "gl", "lua vim.diagnostic.open_float()", opts) +-- keymap(bufnr, "n", "lf", "lua vim.lsp.buf.format{ async = true }", opts) +-- keymap(bufnr, "n", "li", "LspInfo", opts) +-- keymap(bufnr, "n", "lI", "Mason", opts) +-- keymap(bufnr, "n", "la", "lua vim.lsp.buf.code_action()", opts) +-- keymap(bufnr, "n", "lj", "lua vim.diagnostic.goto_next({buffer=0})", opts) +-- keymap(bufnr, "n", "lk", "lua vim.diagnostic.goto_prev({buffer=0})", opts) +-- keymap(bufnr, "n", "lr", "lua vim.lsp.buf.rename()", opts) +-- keymap(bufnr, "n", "ls", "lua vim.lsp.buf.signature_help()", opts) +-- keymap(bufnr, "n", "lq", "lua vim.diagnostic.setloclist()", opts) +-- if on_save then +-- local augroup = vim.api.nvim_create_augroup("LspFormatting", {}) +-- vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr }) +-- vim.api.nvim_create_autocmd("BufWritePre", { +-- group = augroup, +-- buffer = bufnr, +-- callback = function() +-- vim.lsp.buf.format({ bufnr = bufnr, timeout_ms = pcode.format_timeout_ms or 5000, filter = FORMAT_FILTER }) +-- end, +-- }) +-- else +-- vim.schedule(function() +-- pcall(function() +-- vim.api.nvim_clear_autocmds({ group = "LspFormatting" }) +-- end) +-- end) +-- end +-- end +-- M.on_attach = function(client, bufnr) +-- attach_navic(client, bufnr) +-- if client.name == "tsserver" then +-- client.server_capabilities.documentFormattingProvider = false +-- end +-- +-- if client.name == "lua_ls" then +-- client.server_capabilities.documentFormattingProvider = false +-- end +-- +-- if client.supports_method("textDocument/inlayHint") then +-- -- vim.lsp.inlay_hint.enable(bufnr, true) +-- vim.lsp.inlay_hint.enable(true) +-- end +-- +-- local on_save = pcode.format_on_save or false +-- -- disable if conform active +-- local status, _ = pcall(require, "conform") +-- if status then +-- on_save = false +-- end +-- lsp_keymaps(bufnr, on_save) +-- local status_ok, illuminate = pcall(require, "illuminate") +-- if not status_ok then +-- return +-- end +-- illuminate.on_attach(client) +-- end +-- +-- return M diff --git a/lua/user/lsp/settings/clangd.lua b/lua/user/lsp/settings_backup/clangd.lua similarity index 100% rename from lua/user/lsp/settings/clangd.lua rename to lua/user/lsp/settings_backup/clangd.lua diff --git a/lua/user/lsp/settings/denols.lua b/lua/user/lsp/settings_backup/denols.lua similarity index 100% rename from lua/user/lsp/settings/denols.lua rename to lua/user/lsp/settings_backup/denols.lua diff --git a/lua/user/lsp/settings/emmet_ls.lua b/lua/user/lsp/settings_backup/emmet_ls.lua similarity index 100% rename from lua/user/lsp/settings/emmet_ls.lua rename to lua/user/lsp/settings_backup/emmet_ls.lua diff --git a/lua/user/lsp/settings/eslint.lua b/lua/user/lsp/settings_backup/eslint.lua similarity index 100% rename from lua/user/lsp/settings/eslint.lua rename to lua/user/lsp/settings_backup/eslint.lua diff --git a/lua/user/lsp/settings/intelephense.lua b/lua/user/lsp/settings_backup/intelephense.lua similarity index 100% rename from lua/user/lsp/settings/intelephense.lua rename to lua/user/lsp/settings_backup/intelephense.lua diff --git a/lua/user/lsp/settings/jdtls.lua b/lua/user/lsp/settings_backup/jdtls.lua similarity index 100% rename from lua/user/lsp/settings/jdtls.lua rename to lua/user/lsp/settings_backup/jdtls.lua diff --git a/lua/user/lsp/settings/jsonls.lua b/lua/user/lsp/settings_backup/jsonls.lua similarity index 94% rename from lua/user/lsp/settings/jsonls.lua rename to lua/user/lsp/settings_backup/jsonls.lua index b557dbf..16d1873 100644 --- a/lua/user/lsp/settings/jsonls.lua +++ b/lua/user/lsp/settings_backup/jsonls.lua @@ -1,19 +1,19 @@ -return { - settings = { - json = { - schemas = require("schemastore").json.schemas(), - }, - }, - setup = { - commands = { - Format = { - function() - vim.lsp.buf.range_formatting({}, { 0, 0 }, { vim.fn.line("$"), 0 }) - end, - }, - }, - }, - init_options = { - provideFormatter = false, - }, -} +return { + settings = { + json = { + schemas = require("schemastore").json.schemas(), + }, + }, + setup = { + commands = { + Format = { + function() + vim.lsp.buf.range_formatting({}, { 0, 0 }, { vim.fn.line("$"), 0 }) + end, + }, + }, + }, + init_options = { + provideFormatter = false, + }, +} diff --git a/lua/user/lsp/settings/kotlin_language_server.lua b/lua/user/lsp/settings_backup/kotlin_language_server.lua similarity index 100% rename from lua/user/lsp/settings/kotlin_language_server.lua rename to lua/user/lsp/settings_backup/kotlin_language_server.lua diff --git a/lua/user/lsp/settings/lua_ls.lua b/lua/user/lsp/settings_backup/lua_ls.lua similarity index 100% rename from lua/user/lsp/settings/lua_ls.lua rename to lua/user/lsp/settings_backup/lua_ls.lua diff --git a/lua/user/lsp/settings/pyright.lua b/lua/user/lsp/settings_backup/pyright.lua similarity index 92% rename from lua/user/lsp/settings/pyright.lua rename to lua/user/lsp/settings_backup/pyright.lua index 94b4419..c2a518d 100644 --- a/lua/user/lsp/settings/pyright.lua +++ b/lua/user/lsp/settings_backup/pyright.lua @@ -1,9 +1,9 @@ -return { - settings = { - python = { - analysis = { - typeCheckingMode = "off", - }, - }, - }, -} +return { + settings = { + python = { + analysis = { + typeCheckingMode = "off", + }, + }, + }, +} diff --git a/lua/user/lsp/settings/sqlls.lua b/lua/user/lsp/settings_backup/sqlls.lua similarity index 100% rename from lua/user/lsp/settings/sqlls.lua rename to lua/user/lsp/settings_backup/sqlls.lua diff --git a/lua/user/lsp/settings/stimulus_ls.lua b/lua/user/lsp/settings_backup/stimulus_ls.lua similarity index 100% rename from lua/user/lsp/settings/stimulus_ls.lua rename to lua/user/lsp/settings_backup/stimulus_ls.lua diff --git a/lua/user/lsp/settings/tailwindcss.lua b/lua/user/lsp/settings_backup/tailwindcss.lua similarity index 100% rename from lua/user/lsp/settings/tailwindcss.lua rename to lua/user/lsp/settings_backup/tailwindcss.lua diff --git a/lua/user/lsp/settings/tsserver.lua b/lua/user/lsp/settings_backup/tsserver.lua similarity index 100% rename from lua/user/lsp/settings/tsserver.lua rename to lua/user/lsp/settings_backup/tsserver.lua diff --git a/lua/user/lsp/settings/vuels.lua b/lua/user/lsp/settings_backup/vuels.lua similarity index 100% rename from lua/user/lsp/settings/vuels.lua rename to lua/user/lsp/settings_backup/vuels.lua diff --git a/lua/user/lsp/settings/yamlls.lua b/lua/user/lsp/settings_backup/yamlls.lua similarity index 100% rename from lua/user/lsp/settings/yamlls.lua rename to lua/user/lsp/settings_backup/yamlls.lua