From fa3e94e60b9edc7c3620f43e207b915eae84bab0 Mon Sep 17 00:00:00 2001 From: Elvis Claros Castro Date: Fri, 20 Sep 2024 23:08:00 -0300 Subject: feat: solo dejo phpactor --- lua/plugins/animation.lua | 2 +- lua/plugins/noice.lua | 256 ++++++++++++++++++++++++++++++++-------------- lua/plugins/none-ls.lua | 2 + lua/plugins/phpactor.lua | 61 ----------- 4 files changed, 181 insertions(+), 140 deletions(-) delete mode 100644 lua/plugins/phpactor.lua (limited to 'lua/plugins') diff --git a/lua/plugins/animation.lua b/lua/plugins/animation.lua index 386c761..865287e 100644 --- a/lua/plugins/animation.lua +++ b/lua/plugins/animation.lua @@ -4,7 +4,7 @@ return { "anuvyklack/middleclass", }, keys = { - {"aa", function () + {"AA", function () require("pi.animations").redraw_buffer() end} }, diff --git a/lua/plugins/noice.lua b/lua/plugins/noice.lua index 70e81e9..7cd5593 100644 --- a/lua/plugins/noice.lua +++ b/lua/plugins/noice.lua @@ -5,108 +5,208 @@ return { }, event = "VeryLazy", opts = { - lsp = { - -- override markdown rendering so that **cmp** and other plugins use **Treesitter** - override = { - ["vim.lsp.util.convert_input_to_markdown_lines"] = true, - ["vim.lsp.util.stylize_markdown"] = true, - ["cmp.entry.get_documentation"] = true, - }, - }, - -- -- you can enable a preset for easier configuration - presets = { - bottom_search = true, -- use a classic bottom cmdline for search - -- command_palette = true, -- position the cmdline and popupmenu together - long_message_to_split = true, -- long messages will be sent to a split - -- inc_rename = false, -- enables an input dialog for inc-rename.nvim - lsp_doc_border = true, -- add a border to hover docs and signature help - }, cmdline = { - view = "cmdline", + enabled = true, -- enables the Noice cmdline UI + view = "cmdline_popup", -- view for rendering the cmdline. Change to `cmdline` to get a classic cmdline at the bottom + opts = {}, -- global options for the cmdline. See section on views + ---@type table + format = { + -- conceal: (default=true) This will hide the text in the cmdline that matches the pattern. + -- view: (default is cmdline view) + -- opts: any options passed to the view + -- icon_hl_group: optional hl_group for the icon + -- title: set to anything or empty string to hide + cmdline = { pattern = "^:", icon = "", lang = "vim" }, + search_down = { kind = "search", pattern = "^/", icon = " ", lang = "regex" }, + search_up = { kind = "search", pattern = "^%?", icon = " ", lang = "regex" }, + filter = { pattern = "^:%s*!", icon = "$", lang = "bash" }, + lua = { pattern = { "^:%s*lua%s+", "^:%s*lua%s*=%s*", "^:%s*=%s*" }, icon = "", lang = "lua" }, + help = { pattern = "^:%s*he?l?p?%s+", icon = "" }, + input = { view = "cmdline_input", icon = "󰥻 " }, -- Used by input() + -- lua = false, -- to disable a format, set to `false` + }, }, messages = { + -- NOTE: If you enable messages, then the cmdline is enabled automatically. + -- This is a current Neovim limitation. enabled = true, -- enables the Noice messages UI view = "notify", -- default view for messages view_error = "notify", -- view for errors view_warn = "notify", -- view for warnings view_history = "messages", -- view for :messages - view_search = false, -- view for search count messages. Set to `false` to disable + view_search = "virtualtext", -- view for search count messages. Set to `false` to disable }, - routes = { - { + popupmenu = { + enabled = true, -- enables the Noice popupmenu UI + ---@type 'nui'|'cmp' + backend = "nui", -- backend to use to show regular cmdline completions + ---@type NoicePopupmenuItemKind|false + -- Icons for completion item kinds (see defaults at noice.config.icons.kinds) + kind_icons = {}, -- set to `false` to disable icons + }, + -- default options for require('noice').redirect + -- see the section on Command Redirection + ---@type NoiceRouteConfig + redirect = { + view = "popup", + filter = { event = "msg_show" }, + }, + -- You can add any custom commands below that will be available with `:Noice command` + ---@type table + commands = { + history = { + -- options for the message history that you get with `:Noice` view = "split", + opts = { enter = true, format = "details" }, filter = { - cmdline = "G", - }, - opts = { - enter = true, - render = "plain", - format = { "{message}" }, - replace = true, - close = { - events = { "BufLeave" }, - keys = { "q" }, + any = { + { event = "notify" }, + { error = true }, + { warning = true }, + { event = "msg_show", kind = { "" } }, + { event = "lsp", kind = "message" }, }, }, }, - { - view = "split", + -- :Noice last + last = { + view = "popup", + opts = { enter = true, format = "details" }, filter = { - cmdline = "Notifications", - }, - opts = { - enter = true, - render = "plain", - format = { "{message}" }, - replace = true, - close = { - events = { "BufLeave" }, - keys = { "q" }, + any = { + { event = "notify" }, + { error = true }, + { warning = true }, + { event = "msg_show", kind = { "" } }, + { event = "lsp", kind = "message" }, }, }, + filter_opts = { count = 1 }, }, - { - view = "mini", - filter = { - cmdline = "w", - }, + -- :Noice errors + errors = { + -- options for the message history that you get with `:Noice` + view = "popup", + opts = { enter = true, format = "details" }, + filter = { error = true }, + filter_opts = { reverse = true }, }, - { + all = { + -- options for the message history that you get with `:Noice` + view = "split", + opts = { enter = true, format = "details" }, + filter = {}, + }, + }, + notify = { + -- Noice can be used as `vim.notify` so you can route any notification like other messages + -- Notification messages have their level and other properties set. + -- event is always "notify" and kind can be any log level as a string + -- The default routes will forward notifications to nvim-notify + -- Benefit of using Noice for this is the routing and consistent history view + enabled = true, + view = "notify", + }, + lsp = { + progress = { + enabled = true, + -- Lsp Progress is formatted using the builtins for lsp_progress. See config.format.builtin + -- See the section on formatting for more details on how to customize. + --- @type NoiceFormat|string + format = "lsp_progress", + --- @type NoiceFormat|string + format_done = "lsp_progress_done", + throttle = 1000 / 30, -- frequency to update lsp progress message view = "mini", - filter = { - find = "Config Change Detected. Reloading...", + }, + override = { + -- override the default lsp markdown formatter with Noice + ["vim.lsp.util.convert_input_to_markdown_lines"] = false, + -- override the lsp markdown formatter with Noice + ["vim.lsp.util.stylize_markdown"] = false, + -- override cmp documentation with Noice (needs the other options to work) + ["cmp.entry.get_documentation"] = false, + }, + hover = { + enabled = true, + silent = false, -- set to true to not show a message if hover is not available + view = nil, -- when nil, use defaults from documentation + ---@type NoiceViewOptions + opts = {}, -- merged with defaults from documentation + }, + signature = { + enabled = true, + auto_open = { + enabled = true, + trigger = true, -- Automatically show signature help when typing a trigger character from the LSP + luasnip = true, -- Will open signature help when jumping to Luasnip insert nodes + throttle = 50, -- Debounce lsp signature help request by 50ms }, + view = nil, -- when nil, use defaults from documentation + ---@type NoiceViewOptions + opts = {}, -- merged with defaults from documentation }, - { - view = "mini", - filter = { - any = { - { - event = "msg_show", - find = "lines yanked", - }, - { - event = "msg_show", - find = "more lines", - }, - { - event = "msg_show", - find = "direnv:", - }, - { - find = "laravel.sail.", - }, - { - find = "Pattern not found", - }, - { - event = "msg_show", - kind = "", - find = "change;", - }, - }, + message = { + -- Messages shown by lsp servers + enabled = true, + view = "notify", + opts = {}, + }, + -- defaults for hover and signature help + documentation = { + view = "hover", + ---@type NoiceViewOptions + opts = { + lang = "markdown", + replace = true, + render = "plain", + format = { "{message}" }, + win_options = { concealcursor = "n", conceallevel = 3 }, }, }, }, + markdown = { + hover = { + ["|(%S-)|"] = vim.cmd.help, -- vim help links + ["%[.-%]%((%S-)%)"] = require("noice.util").open, -- markdown links + }, + highlights = { + ["|%S-|"] = "@text.reference", + ["@%S+"] = "@parameter", + ["^%s*(Parameters:)"] = "@text.title", + ["^%s*(Return:)"] = "@text.title", + ["^%s*(See also:)"] = "@text.title", + ["{%S-}"] = "@parameter", + }, + }, + health = { + checker = true, -- Disable if you don't want health checks to run + }, + ---@type NoicePresets + presets = { + -- you can enable a preset by setting it to true, or a table that will override the preset config + -- you can also add custom presets that you can enable/disable with enabled=true + bottom_search = false, -- use a classic bottom cmdline for search + command_palette = false, -- position the cmdline and popupmenu together + long_message_to_split = false, -- long messages will be sent to a split + inc_rename = false, -- enables an input dialog for inc-rename.nvim + lsp_doc_border = false, -- add a border to hover docs and signature help + }, + throttle = 1000 / 30, -- how frequently does Noice need to check for ui updates? This has no effect when in blocking mode. + ---@type NoiceConfigViews + views = {}, ---@see section on views + ---@type NoiceRouteConfig[] + routes = {}, --- @see section on routes + ---@type table + status = {}, --- @see section on statusline components + ---@type NoiceFormatOptions + format = {}, --- @see section on formatting + routes = { + { view = "split", filter = { cmdline = "G" }, opts = { enter = true, render = "plain", format = { "{message}" }, replace = true, close = { events = { "BufLeave" }, keys = { "q" } } } }, + { view = "split", filter = { cmdline = "Notifications" }, opts = { enter = true, render = "plain", format = { "{message}" }, replace = true, close = { events = { "BufLeave" }, keys = { "q" } } } }, + { view = "mini", filter = { cmdline = "w" } }, + { view = "mini", filter = { find = "Config Change Detected. Reloading..." } }, + { view = "mini", filter = { any = { { event = "msg_show", find = "lines yanked" }, { event = "msg_show", find = "more lines" }, { event = "msg_show", find = "direnv:" }, { find = "laravel.sail." }, { find = "Pattern not found" }, { event = "msg_show", kind = "", find = "change;" } } } }, + }, }, } diff --git a/lua/plugins/none-ls.lua b/lua/plugins/none-ls.lua index 6ddd127..58286ff 100644 --- a/lua/plugins/none-ls.lua +++ b/lua/plugins/none-ls.lua @@ -5,5 +5,7 @@ return "nvimtools/none-ls-extras.nvim", "gbprod/none-ls-luacheck.nvim", "gbprod/none-ls-shellcheck.nvim", + -- "gbprod/none-ls-php.nvim", + -- "gbprod/none-ls-ecs.nvim", }, } diff --git a/lua/plugins/phpactor.lua b/lua/plugins/phpactor.lua deleted file mode 100644 index 1988c92..0000000 --- a/lua/plugins/phpactor.lua +++ /dev/null @@ -1,61 +0,0 @@ -local phpactor = function () - vim.ui.select({ - "class_inflect", - "context_menu", - "expand_class", - "generate_accessor", - "change_visibility", - "copy_class", - "import_class", - "import_missing_classes", - "move_class", - "navigate", - "new_class", - "transform", - "update", - "config", - "status", - "cache_clear", - }, { - prompt = "Phpactor Action", - }, function(choice) - if choice == nil or choice == "" then - return - end - - -- TODO: add option for new class in same directory - if choice == "new_class" then - return vim.ui.input({ - prompt = "New Class", - }, function(value) - if value == nil then - return - end - -- TODO: check filename generation to validate the path - require("phpactor").rpc("new_class", { text_value = vim.fn.getcwd() .. '/' .. value .. ".php" }) - end) - end - - require("phpactor").rpc(choice, {}) - end) -end - -return { - "adalessa/phpactor.nvim", - cmd = { "PhpActor" }, - keys = { - { "pa", phpactor, desc = "PhpActor options" }, - { "pc", ":PhpActor context_menu", desc = "PhpActor context menu" }, - }, - dependencies = { - "nvim-lua/plenary.nvim", - }, - opts = { - install = { - bin = 'phpactor' - }, - lspconfig = { - enabled = false, - }, - }, -} -- cgit v1.2.3