diff options
| -rw-r--r-- | after/plugin/hydra.lua | 44 | ||||
| -rw-r--r-- | after/plugin/lsp.lua | 13 | ||||
| -rw-r--r-- | after/plugin/null-ls.lua | 1 | ||||
| -rw-r--r-- | lua/alpha/scratchs/graphql_queries.lua (renamed from lua/alpha/scratchs/draft.lua) | 1 | ||||
| -rw-r--r-- | lua/alpha/scratchs/intelephense_symbol.lua | 28 | ||||
| -rw-r--r-- | lua/alpha/snips/ft/php.lua | 3 |
6 files changed, 57 insertions, 33 deletions
diff --git a/after/plugin/hydra.lua b/after/plugin/hydra.lua index 64088ab..2538f68 100644 --- a/after/plugin/hydra.lua +++ b/after/plugin/hydra.lua @@ -4,28 +4,28 @@ if not ok then end -- Windows management, move and resize -hydra({ - name = "windows", - mode = "n", - body = "<C-w>", - heads = { - { "l", "<C-w>l" }, - { "h", "<C-w>h" }, - { "j", "<C-w>j" }, - { "k", "<C-w>k" }, - { "q", "<C-w>q" }, - { "o", "<C-w>o" }, - { "L", "<C-w>2>" }, - { "H", "<C-w>2<" }, - { "J", "<C-w>2-" }, - { "K", "<C-w>2+" }, - -- { "<C-l>", "<C-w>L" }, - -- { "<C-h>", "<C-w>H" }, - -- { "<C-j>", "<C-w>J" }, - -- { "<C-k>", "<C-w>K" }, - { "=", "<C-w>=" }, - }, -}) +-- hydra({ +-- name = "windows", +-- mode = "n", +-- body = "<C-w>", +-- heads = { +-- { "l", "<C-w>l" }, +-- { "h", "<C-w>h" }, +-- { "j", "<C-w>j" }, +-- { "k", "<C-w>k" }, +-- { "q", "<C-w>q" }, +-- { "o", "<C-w>o" }, +-- { "L", "<C-w>2>" }, +-- { "H", "<C-w>2<" }, +-- { "J", "<C-w>2-" }, +-- { "K", "<C-w>2+" }, +-- -- { "<C-l>", "<C-w>L" }, +-- -- { "<C-h>", "<C-w>H" }, +-- -- { "<C-j>", "<C-w>J" }, +-- -- { "<C-k>", "<C-w>K" }, +-- { "=", "<C-w>=" }, +-- }, +-- }) -- want a way to run make commands -- Make commands runs good but the output is not good diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua index 981346c..479e5c2 100644 --- a/after/plugin/lsp.lua +++ b/after/plugin/lsp.lua @@ -55,8 +55,8 @@ vim.keymap.set("n", "<leader>vf", function() return vim.lsp.buf.format({ async = true }) end, {}) -vim.keymap.set("n", "<leader>vn", vim.diagnostic.goto_next, { buffer = 0 }) -vim.keymap.set("n", "<leader>vp", vim.diagnostic.goto_prev, { buffer = 0 }) +vim.keymap.set("n", "<leader>vn", vim.diagnostic.goto_next, {}) +vim.keymap.set("n", "<leader>vp", vim.diagnostic.goto_prev, {}) local function on_attach(client, bufnr) local filetype = vim.api.nvim_buf_get_option(0, "filetype") @@ -81,13 +81,6 @@ local function on_attach(client, bufnr) filetype_attach[filetype](client,bufnr) end --- vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, { --- underline = true, --- update_in_insert = false, --- virtual_text = { spacing = 2, prefix = "●" }, --- severity_sort = true, --- }) - vim.diagnostic.config({ virtual_text = false, }) @@ -103,6 +96,8 @@ local lsp_flags = { debounce_text_changes = 150, } +-- Server configurations + require("lspconfig")["rust_analyzer"].setup({ on_attach = on_attach, flags = lsp_flags, diff --git a/after/plugin/null-ls.lua b/after/plugin/null-ls.lua index b530724..450f484 100644 --- a/after/plugin/null-ls.lua +++ b/after/plugin/null-ls.lua @@ -11,7 +11,6 @@ local sources = { -- null_ls.builtins.diagnostics.eslint, null_ls.builtins.diagnostics.phpstan.with({ command = "./bin/phpstan", - to_temp_file= false, }), null_ls.builtins.diagnostics.phpcs.with({ command = "./bin/phpcs", diff --git a/lua/alpha/scratchs/draft.lua b/lua/alpha/scratchs/graphql_queries.lua index 8954fdc..3997d86 100644 --- a/lua/alpha/scratchs/draft.lua +++ b/lua/alpha/scratchs/graphql_queries.lua @@ -32,7 +32,6 @@ local function getElements() local parsers = require("nvim-treesitter.parsers") local parser = parsers.get_parser(0) - ---@diagnostic disable-next-line: deprecated local tree = unpack(parser:parse()) for id, node in query:iter_captures(tree:root(), 0) do diff --git a/lua/alpha/scratchs/intelephense_symbol.lua b/lua/alpha/scratchs/intelephense_symbol.lua new file mode 100644 index 0000000..3f039f3 --- /dev/null +++ b/lua/alpha/scratchs/intelephense_symbol.lua @@ -0,0 +1,28 @@ +local function get_intelephense_buffer() + local clients = vim.lsp.get_active_clients({ name = "intelephense" }) + if #clients == 0 then + return + end + + local intelephense = clients[1] + + local attached_buffers = intelephense.attached_buffers + + for key, val in pairs(attached_buffers) do + if val then + return key + end + end + + return nil +end + +vim.keymap.set({'n'}, '<leader>pc', function () + local buffer = get_intelephense_buffer() + + if buffer == nil then + return + end + + require("telescope.builtin").lsp_workspace_symbols({ bufnr = buffer, query = vim.fn.expand("<cword>") }) +end) diff --git a/lua/alpha/snips/ft/php.lua b/lua/alpha/snips/ft/php.lua index 70cf49b..a9bbe37 100644 --- a/lua/alpha/snips/ft/php.lua +++ b/lua/alpha/snips/ft/php.lua @@ -48,6 +48,9 @@ local namespace = function() end end dir = dir:gsub("/", "\\") + if dir == "" then + return globalNamespace + end return string.format("%s\\%s", globalNamespace, dir) end |