From 0ffcea8234e2148bdb0c003a37c39bf0c0a99376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20SALVI?= Date: Thu, 19 Dec 2024 00:24:22 +0100 Subject: [PATCH] debug since deprecated conform setting --- lua/config/lsp/ansible.lua | 56 +++++++++++------------ lua/config/lsp/bash.lua | 56 +++++++++++------------ lua/config/lsp/lua.lua | 88 ++++++++++++++++++------------------ lua/config/lsp/php.lua | 68 ++++++++++++++-------------- lua/config/lsp/web.lua | 91 +++++++++++++++++++------------------- 5 files changed, 180 insertions(+), 179 deletions(-) diff --git a/lua/config/lsp/ansible.lua b/lua/config/lsp/ansible.lua index 401b1f0..2145224 100644 --- a/lua/config/lsp/ansible.lua +++ b/lua/config/lsp/ansible.lua @@ -1,57 +1,57 @@ local ok, mason_lspconfig, mason_tool_installer, lspconfig, conform, lint = pcall(function() - return require("mason-lspconfig"), - require("mason-tool-installer"), - require("lspconfig"), - require("conform"), - require("lint") + return require("mason-lspconfig"), + require("mason-tool-installer"), + require("lspconfig"), + require("conform"), + require("lint") end) if not ok then - return + return end mason_lspconfig.setup({ - ensure_installed = { "ansiblels" }, + ensure_installed = { "ansiblels" }, }) lspconfig.ansiblels.setup({ - capabilities = require("config/lsp/lsp-capabilities"), - on_attach = require("config/lsp/lsp-attach"), + capabilities = require("config/lsp/lsp-capabilities"), + on_attach = require("config/lsp/lsp-attach"), }) mason_tool_installer.setup({ - ensure_installed = { "ansible-lint" }, + ensure_installed = { "ansible-lint" }, }) conform.setup({ - formatters_by_ft = { - yml = { "ansible-lint" }, - }, - format_on_save = { - async = false, - timeout_ms = 500, - lsp_fallback = true, - }, + formatters_by_ft = { + yaml = { "ansible-lint" }, + }, + format_on_save = { + async = false, + timeout_ms = 500, + lsp_format = "fallback", + }, }) vim.keymap.set({ "n", "v" }, "lf", function() - conform.format({ - async = false, - timeout_ms = 500, - lsp_fallback = true, - }) + conform.format({ + async = false, + timeout_ms = 500, + lsp_format = "fallback", + }) end, { desc = "Format" }) lint.linters_by_ft = { - yml = { "ansible-lint" }, + yml = { "ansible-lint" }, } vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, { - callback = function() - lint.try_lint() - end, + callback = function() + lint.try_lint() + end, }) vim.keymap.set("n", "ll", function() - lint.try_lint() + lint.try_lint() end, { desc = "Lint" }) diff --git a/lua/config/lsp/bash.lua b/lua/config/lsp/bash.lua index ad9a996..e615cd6 100644 --- a/lua/config/lsp/bash.lua +++ b/lua/config/lsp/bash.lua @@ -1,57 +1,57 @@ local ok, mason_lspconfig, mason_tool_installer, lspconfig, conform, lint = pcall(function() - return require("mason-lspconfig"), - require("mason-tool-installer"), - require("lspconfig"), - require("conform"), - require("lint") + return require("mason-lspconfig"), + require("mason-tool-installer"), + require("lspconfig"), + require("conform"), + require("lint") end) if not ok then - return + return end mason_lspconfig.setup({ - ensure_installed = { "bashls" }, + ensure_installed = { "bashls" }, }) lspconfig.bashls.setup({ - capabilities = require("config/lsp/lsp-capabilities"), - on_attach = require("config/lsp/lsp-attach"), + capabilities = require("config/lsp/lsp-capabilities"), + on_attach = require("config/lsp/lsp-attach"), }) mason_tool_installer.setup({ - ensure_installed = { "shellcheck" }, + ensure_installed = { "shellcheck" }, }) conform.setup({ - formatters_by_ft = { - sh = { "shellcheck" }, - }, - format_on_save = { - async = false, - timeout_ms = 500, - lsp_fallback = true, - }, + formatters_by_ft = { + sh = { "shellcheck" }, + }, + format_on_save = { + async = false, + timeout_ms = 500, + lsp_format = "fallback", + }, }) vim.keymap.set({ "n", "v" }, "lf", function() - conform.format({ - async = false, - timeout_ms = 500, - lsp_fallback = true, - }) + conform.format({ + async = false, + timeout_ms = 500, + lsp_format = "fallback", + }) end, { desc = "Format" }) lint.linters_by_ft = { - sh = { "shellcheck" }, + sh = { "shellcheck" }, } vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, { - callback = function() - lint.try_lint() - end, + callback = function() + lint.try_lint() + end, }) vim.keymap.set("n", "ll", function() - lint.try_lint() + lint.try_lint() end, { desc = "Lint" }) diff --git a/lua/config/lsp/lua.lua b/lua/config/lsp/lua.lua index a92c711..8b630d9 100644 --- a/lua/config/lsp/lua.lua +++ b/lua/config/lsp/lua.lua @@ -1,73 +1,73 @@ local ok, mason_lspconfig, mason_tool_installer, lspconfig, conform, lint = pcall(function() - return require("mason-lspconfig"), - require("mason-tool-installer"), - require("lspconfig"), - require("conform"), - require("lint") + return require("mason-lspconfig"), + require("mason-tool-installer"), + require("lspconfig"), + require("conform"), + require("lint") end) if not ok then - return + return end mason_lspconfig.setup({ - ensure_installed = { "lua_ls" }, + ensure_installed = { "lua_ls" }, }) mason_tool_installer.setup({ - ensure_installed = { "stylua", "luacheck" }, + ensure_installed = { "stylua", "luacheck" }, }) lspconfig.lua_ls.setup({ - -- capabilities = cmp_nvim_lsp.default_capabilities() - capabilities = require("config/lsp/lsp-capabilities"), - on_attach = require("config/lsp/lsp-attach"), - settings = { -- custom settings for lua - Lua = { - -- make the language server recognize "vim" global - diagnostics = { - globals = { "vim" }, - }, - workspace = { - -- make language server aware of runtime files - library = { - [vim.fn.expand("$VIMRUNTIME/lua")] = true, - [vim.fn.stdpath("config") .. "/lua"] = true, - }, - }, - }, - }, + -- capabilities = cmp_nvim_lsp.default_capabilities() + capabilities = require("config/lsp/lsp-capabilities"), + on_attach = require("config/lsp/lsp-attach"), + settings = { -- custom settings for lua + Lua = { + -- make the language server recognize "vim" global + diagnostics = { + globals = { "vim" }, + }, + workspace = { + -- make language server aware of runtime files + library = { + [vim.fn.expand("$VIMRUNTIME/lua")] = true, + [vim.fn.stdpath("config") .. "/lua"] = true, + }, + }, + }, + }, }) conform.setup({ - formatters_by_ft = { - lua = { "stylua" }, - }, - format_on_save = { - async = false, - timeout_ms = 500, - lsp_fallback = true, - }, + formatters_by_ft = { + lua = { "stylua" }, + }, + format_on_save = { + async = false, + timeout_ms = 500, + lsp_format = "fallback", + }, }) vim.keymap.set({ "n", "v" }, "lf", function() - conform.format({ - async = false, - timeout_ms = 500, - lsp_fallback = true, - }) + conform.format({ + async = false, + timeout_ms = 500, + lsp_format = "fallback", + }) end, { desc = "Format" }) lint.linters_by_ft = { - lua = { "luacheck" }, + lua = { "luacheck" }, } vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, { - callback = function() - lint.try_lint() - end, + callback = function() + lint.try_lint() + end, }) vim.keymap.set("n", "ll", function() - lint.try_lint() + lint.try_lint() end, { desc = "Lint" }) diff --git a/lua/config/lsp/php.lua b/lua/config/lsp/php.lua index 4569578..23cea51 100644 --- a/lua/config/lsp/php.lua +++ b/lua/config/lsp/php.lua @@ -1,63 +1,63 @@ local ok, mason_lspconfig, mason_tool_installer, lspconfig, conform, lint = pcall(function() - return require("mason-lspconfig"), - require("mason-tool-installer"), - require("lspconfig"), - require("conform"), - require("lint") + return require("mason-lspconfig"), + require("mason-tool-installer"), + require("lspconfig"), + require("conform"), + require("lint") end) if not ok then - return + return end mason_lspconfig.setup({ - ensure_installed = { - "intelephense", - "phpactor", - }, + ensure_installed = { + "intelephense", + "phpactor", + }, }) lspconfig.intelephense.setup({ - capabilities = require("config/lsp/lsp-capabilities"), - on_attach = require("config/lsp/lsp-attach"), + capabilities = require("config/lsp/lsp-capabilities"), + on_attach = require("config/lsp/lsp-attach"), }) mason_tool_installer.setup({ - ensure_installed = { - "php-cs-fixer", - "phpcs", - }, + ensure_installed = { + "php-cs-fixer", + "phpcs", + }, }) conform.setup({ - formatters_by_ft = { - php = { "php-cs-fixer" }, - }, - format_on_save = { - async = false, - timeout_ms = 500, - lsp_fallback = true, - }, + formatters_by_ft = { + php = { "php-cs-fixer" }, + }, + format_on_save = { + async = false, + timeout_ms = 500, + lsp_format = "fallback", + }, }) vim.keymap.set({ "n", "v" }, "lf", function() - conform.format({ - async = false, - timeout_ms = 500, - lsp_fallback = true, - }) + conform.format({ + async = false, + timeout_ms = 500, + lsp_format = "fallback" + }) end, { desc = "Format" }) lint.linters_by_ft = { - php = { "phpcs" }, + php = { "phpcs" }, } vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, { - callback = function() - lint.try_lint() - end, + callback = function() + lint.try_lint() + end, }) vim.keymap.set("n", "ll", function() - lint.try_lint() + lint.try_lint() end, { desc = "Lint" }) diff --git a/lua/config/lsp/web.lua b/lua/config/lsp/web.lua index 44a67cf..c775047 100644 --- a/lua/config/lsp/web.lua +++ b/lua/config/lsp/web.lua @@ -1,83 +1,84 @@ local ok, mason_lspconfig, mason_tool_installer, lspconfig, conform, lint = pcall(function() - return require("mason-lspconfig"), - require("mason-tool-installer"), - require("lspconfig"), - require("conform"), - require("lint") + return require("mason-lspconfig"), + require("mason-tool-installer"), + require("lspconfig"), + require("conform"), + require("lint") end) if not ok then - return + return end mason_lspconfig.setup({ - ensure_installed = { - "ts_ls", - "html", - "emmet_ls", - "cssls", - }, + ensure_installed = { + "ts_ls", + "html", + "emmet_ls", + "cssls", + }, }) lspconfig.ts_ls.setup({ - capabilities = require("config/lsp/lsp-capabilities"), - on_attach = require("config/lsp/lsp-attach"), + capabilities = require("config/lsp/lsp-capabilities"), + on_attach = require("config/lsp/lsp-attach"), }) lspconfig.html.setup({ - capabilities = require("config/lsp/lsp-capabilities"), - on_attach = require("config/lsp/lsp-attach"), + capabilities = require("config/lsp/lsp-capabilities"), + on_attach = require("config/lsp/lsp-attach"), }) lspconfig.emmet_ls.setup({ - capabilities = require("config/lsp/lsp-capabilities"), - on_attach = require("config/lsp/lsp-attach"), + capabilities = require("config/lsp/lsp-capabilities"), + on_attach = require("config/lsp/lsp-attach"), }) lspconfig.cssls.setup({ - capabilities = require("config/lsp/lsp-capabilities"), - on_attach = require("config/lsp/lsp-attach"), + capabilities = require("config/lsp/lsp-capabilities"), + on_attach = require("config/lsp/lsp-attach"), }) mason_tool_installer.setup({ - ensure_installed = { - "prettierd", - "prettier", - "eslint_d", - }, + ensure_installed = { + "prettierd", + "prettier", + "eslint_d", + }, }) conform.setup({ - formatters_by_ft = { - javascript = { { "prettierd", "prettier" } }, - json = { { "prettierd", "prettier" } }, - }, - format_on_save = { - async = false, - timeout_ms = 500, - lsp_fallback = true, - }, + formatters_by_ft = { + javascript = { "prettierd", "prettier" }, + json = { "prettierd", "prettier" }, + }, + format_on_save = { + async = false, + timeout_ms = 500, + lsp_format = "fallback", + stop_after_first = true + }, }) vim.keymap.set({ "n", "v" }, "lf", function() - conform.format({ - async = false, - timeout_ms = 500, - lsp_fallback = true, - }) + conform.format({ + async = false, + timeout_ms = 500, + lsp_format = "fallback", + }) end, { desc = "Format" }) lint.linters_by_ft = { - javascript = { "eslint_d" }, - json = { "eslint_d" }, + javascript = { "eslint_d" }, + json = { "eslint_d" }, } vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, { - callback = function() - lint.try_lint() - end, + callback = function() + lint.try_lint() + end, }) vim.keymap.set("n", "ll", function() - lint.try_lint() + lint.try_lint() end, { desc = "Lint" })