From f8d980ba0d5dd1a67f9d1e34d9e876109f808739 Mon Sep 17 00:00:00 2001 From: jabuxas Date: Fri, 24 Jan 2025 11:44:39 -0300 Subject: [PATCH] feat: add php support --- init.lua | 11 ++++++++++- lua/custom/plugins/cmp.lua | 4 ++-- lua/custom/plugins/emmet.lua | 2 +- lua/custom/plugins/none_ls.lua | 7 ++++--- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/init.lua b/init.lua index 3a7c522..777a8e1 100644 --- a/init.lua +++ b/init.lua @@ -362,7 +362,7 @@ local servers = { } }, }, - html = { provideFormatter = false }, + html = { provideFormatter = false, filetypes = {"html", "htmldjango"} }, cssls = {}, pyright = { settings = { @@ -396,6 +396,13 @@ local servers = { }, }, + phpactor = { + -- init_options = { + -- language_server_phpstan.enabled = false, + -- language_server_psalm.enabled = false, + -- }, + }, + ts_ls = { init_options = { plugins = { @@ -433,6 +440,8 @@ vim.list_extend(ensure_installed, { 'goimports-reviser', 'golines', 'golangci-lint', + 'ruff', + 'phpcbf', }) require('mason-tool-installer').setup { ensure_installed = ensure_installed } diff --git a/lua/custom/plugins/cmp.lua b/lua/custom/plugins/cmp.lua index dfec7ce..0667fd9 100644 --- a/lua/custom/plugins/cmp.lua +++ b/lua/custom/plugins/cmp.lua @@ -92,8 +92,8 @@ return { -- }, -- }, mapping = cmp.mapping.preset.insert { - [''] = cmp.mapping.select_next_item(), - [''] = cmp.mapping.select_prev_item(), + [''] = cmp.mapping.select_next_item(), + [''] = cmp.mapping.select_prev_item(), [''] = cmp.mapping.scroll_docs(-4), [''] = cmp.mapping.scroll_docs(4), [''] = cmp.mapping.complete {}, diff --git a/lua/custom/plugins/emmet.lua b/lua/custom/plugins/emmet.lua index 5c64a91..5ff08f1 100644 --- a/lua/custom/plugins/emmet.lua +++ b/lua/custom/plugins/emmet.lua @@ -2,7 +2,7 @@ return { "mattn/emmet-vim", config = function() local autocmd = vim.api.nvim_create_autocmd - autocmd("FileType", { pattern = { "html", "css", "vue", "js" }, command = [[EmmetInstall]] }) + autocmd("FileType", { pattern = { "html", "php", "css", "vue", "js", "htmldjango" }, command = [[EmmetInstall]] }) vim.keymap.set("n", "le", function() vim.cmd(string.format("Emmet %s", vim.fn.input("Emmet: "))) diff --git a/lua/custom/plugins/none_ls.lua b/lua/custom/plugins/none_ls.lua index 9565c62..e6600f6 100644 --- a/lua/custom/plugins/none_ls.lua +++ b/lua/custom/plugins/none_ls.lua @@ -3,9 +3,10 @@ return { config = function() require("null-ls").setup { sources = { - require("null-ls").builtins.formatting.black.with({ - extra_args = { "--line-length=80" } - }), + -- require("null-ls").builtins.formatting.black.with({ + -- extra_args = { "--line-length=80" } + -- }), + -- require("null-ls").builtins.formatting.ruff, require("null-ls").builtins.formatting.prettierd, require("null-ls").builtins.formatting.gofumpt, require("null-ls").builtins.formatting.goimports_reviser,