diff --git a/README.md b/README.md index 3c2bf92..1779e97 100644 --- a/README.md +++ b/README.md @@ -100,4 +100,18 @@ This document provides a simple and organized overview of all the custom keybind --- -Let me know if you want to modify or add descriptions for any specific keybinds! +# LSP servers: + +I am migrating my lsp config to /lua/plugins/lsp.lua because nvim v0.11 allows a very minimal debloated way to setup language server protocols. + +Below is a running list of what and how to install the lsp's that are going to be configured in this build. I will avoid mason for now because I think its better to have full control over your system, and not outsource it to mason. Just uncommonet `return {` in /plugins/lsp.lua from the original lspconfig if you want to go that route. + +1. { lua-language-server } + - refer to distro ( pacman -Ss lua-language-server ) +2. { css-language-server --studio, html-language-server } + - npm install -g vscode-langservers-extracted +3. { intelephense } + - npm install -g intelephense +4. { typescript-language-server } + - npm install -g typescript-language-server typescript + diff --git a/lua/config/keybinds.lua b/lua/config/keybinds.lua index 4315a83..1c1b42c 100644 --- a/lua/config/keybinds.lua +++ b/lua/config/keybinds.lua @@ -1,26 +1,27 @@ --- KEYBINDS +-- KEYBINDS vim.g.mapleader = " " vim.keymap.set("n", "cd", vim.cmd.Ex) vim.keymap.set("v", "J", ":m '>+1gv=gv") -- Alt Up/Down in vscode vim.keymap.set("v", "K", ":m '<-2gv=gv") -vim.keymap.set("n", "J", "mzJ`z") -- Remap joining lines +vim.keymap.set("n", "J", "mzJ`z") -- Remap joining lines vim.keymap.set("n", "", "zz") -- Keep cursor in place while moving up/down page vim.keymap.set("n", "", "zz") -vim.keymap.set("n", "n", "nzzzv") -- center screen when looping search results +vim.keymap.set("n", "n", "nzzzv") -- center screen when looping search results vim.keymap.set("n", "N", "Nzzzv") -- paste and don't replace clipboard over deleted text vim.keymap.set("x", "p", [["_dP]]) -vim.keymap.set({"n", "v"}, "d", [["_d]]) +vim.keymap.set({ "n", "v" }, "d", [["_d]]) -- sometimes in insert mode, control-c doesn't exactly work like escape vim.keymap.set("i", "", "") -vim.keymap.set("n", "", "cnextzz") -vim.keymap.set("n", "", "cprevzz") +-- add binds for Control J/K to scroll thru quickfix list +vim.keymap.set("n", "", "cnextzz") +vim.keymap.set("n", "", "cprevzz") -- What the heck is Ex mode? vim.keymap.set("n", "Q", "") @@ -49,6 +50,13 @@ vim.keymap.set("n", "rl", "source ~/.config/nvim/init.lua") vim.keymap.set("n", "u", vim.cmd.UndotreeToggle) +-- Quickfix list stuff +vim.keymap.set("n", "cl", ":cclose", { silent = true }) +vim.keymap.set("n", "co", ":copen", { silent = true }) +vim.keymap.set("n", "cn", ":cnextzz") +vim.keymap.set("n", "cp", ":cprevzz") +vim.keymap.set("n", "li", ":checkhealth vim.lsp", { desc = "LSP Info" }) + -- source file vim.keymap.set("n", "", function() vim.cmd("so") diff --git a/lua/plugins/backup-lsp.lua b/lua/plugins/backup-lsp.lua new file mode 100644 index 0000000..a564707 --- /dev/null +++ b/lua/plugins/backup-lsp.lua @@ -0,0 +1 @@ +return {} diff --git a/lua/plugins/colors.lua b/lua/plugins/colors.lua index c5153e4..c1106e9 100644 --- a/lua/plugins/colors.lua +++ b/lua/plugins/colors.lua @@ -5,23 +5,23 @@ local function enable_transparency() end return { - -- { - -- "folke/tokyonight.nvim", - -- config = function() - -- vim.cmd.colorscheme "tokyonight" - -- vim.cmd('hi Directory guibg=NONE') - -- vim.cmd('hi SignColumn guibg=NONE') - -- enable_transparency() - -- end - -- }, { - "Mofiqul/vscode.nvim", - name = 'vscode', + "folke/tokyonight.nvim", config = function() - vim.cmd.colorscheme "vscode" + vim.cmd.colorscheme "tokyonight" vim.cmd('hi Directory guibg=NONE') vim.cmd('hi SignColumn guibg=NONE') enable_transparency() end - } + }, + -- { + -- "Mofiqul/vscode.nvim", + -- name = 'vscode', + -- config = function() + -- vim.cmd.colorscheme "vscode" + -- vim.cmd('hi Directory guibg=NONE') + -- vim.cmd('hi SignColumn guibg=NONE') + -- enable_transparency() + -- end + -- } } diff --git a/lua/plugins/completion.lua b/lua/plugins/completion.lua new file mode 100644 index 0000000..42ff2c4 --- /dev/null +++ b/lua/plugins/completion.lua @@ -0,0 +1,40 @@ +return { + { + "hrsh7th/nvim-cmp", + event = "InsertEnter", + dependencies = { + "hrsh7th/cmp-nvim-lsp", + "hrsh7th/cmp-path", + "hrsh7th/cmp-buffer", + }, + config = function() + local cmp = require("cmp") + + cmp.setup({ + preselect = cmp.PreselectMode.Item, -- <— preselect first item + completion = { completeopt = "menu,menuone,noinsert" }, + window = { documentation = cmp.config.window.bordered() }, + mapping = cmp.mapping.preset.insert({ + [""] = cmp.mapping.confirm({ select = false }), + [""] = cmp.mapping.abort(), + [""] = cmp.mapping.complete(), -- manual trigger if you want it + [""] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Select }), + [""] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Select }), + [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then cmp.select_next_item() else fallback() end + end, { "i", "s" }), + [""] = cmp.mapping(function() + if cmp.visible() then cmp.select_prev_item() end + end, { "i", "s" }), + }), + sources = { + { name = "nvim_lsp" }, + { name = "path" }, + { name = "buffer", keyword_length = 3 }, + }, + }) + end, + }, +} diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 8c0992e..1769f85 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -1,230 +1,228 @@ -return { - 'neovim/nvim-lspconfig', - dependencies = { - 'williamboman/mason.nvim', - 'williamboman/mason-lspconfig.nvim', - -- Autocompletion - 'hrsh7th/nvim-cmp', - 'hrsh7th/cmp-buffer', - 'hrsh7th/cmp-path', - 'saadparwaiz1/cmp_luasnip', - 'hrsh7th/cmp-nvim-lsp', - 'hrsh7th/cmp-nvim-lua', - -- Snippets - 'L3MON4D3/LuaSnip', - 'rafamadriz/friendly-snippets', - }, - config = function() - local autoformat_filetypes = { - "lua", - } - -- Create a keymap for vim.lsp.buf.implementation - vim.api.nvim_create_autocmd('LspAttach', { - callback = function(args) - local client = vim.lsp.get_client_by_id(args.data.client_id) - if not client then return end - if vim.tbl_contains(autoformat_filetypes, vim.bo.filetype) then - vim.api.nvim_create_autocmd("BufWritePre", { - buffer = args.buf, - callback = function() - vim.lsp.buf.format({ - formatting_options = { tabSize = 4, insertSpaces = true }, - bufnr = args.buf, - id = client.id - }) - end - }) - end - end - }) - - -- Add borders to floating windows - 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' } - ) - - -- Configure error/warnings interface - vim.diagnostic.config({ - virtual_text = true, - severity_sort = true, - float = { - style = 'minimal', - border = 'rounded', - header = '', - prefix = '', - }, - signs = { - text = { - [vim.diagnostic.severity.ERROR] = '✘', - [vim.diagnostic.severity.WARN] = '▲', - [vim.diagnostic.severity.HINT] = '⚑', - [vim.diagnostic.severity.INFO] = '»', - }, - }, - }) - - -- Add cmp_nvim_lsp capabilities settings to lspconfig - -- This should be executed before you configure any language server - local lspconfig_defaults = require('lspconfig').util.default_config - lspconfig_defaults.capabilities = vim.tbl_deep_extend( - 'force', - lspconfig_defaults.capabilities, - require('cmp_nvim_lsp').default_capabilities() - ) - - -- This is where you enable features that only work - -- if there is a language server active in the file - vim.api.nvim_create_autocmd('LspAttach', { - callback = function(event) - local opts = { buffer = event.buf } - - vim.keymap.set('n', 'K', 'lua vim.lsp.buf.hover()', opts) - vim.keymap.set('n', 'gd', 'lua vim.lsp.buf.definition()', opts) - vim.keymap.set('n', 'gD', 'lua vim.lsp.buf.declaration()', opts) - vim.keymap.set('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) - vim.keymap.set('n', 'go', 'lua vim.lsp.buf.type_definition()', opts) - vim.keymap.set('n', 'gr', 'lua vim.lsp.buf.references()', opts) - vim.keymap.set('n', 'gs', 'lua vim.lsp.buf.signature_help()', opts) - vim.keymap.set('n', 'gl', 'lua vim.diagnostic.open_float()', opts) - vim.keymap.set('n', '', 'lua vim.lsp.buf.rename()', opts) - vim.keymap.set({ 'n', 'x' }, '', 'lua vim.lsp.buf.format({async = true})', opts) - vim.keymap.set('n', '', 'lua vim.lsp.buf.code_action()', opts) - end, - }) - - require('mason').setup({}) - require('mason-lspconfig').setup({ - ensure_installed = { - "lua_ls", - "intelephense", - "ts_ls", - "eslint", - }, - handlers = { - -- this first function is the "default handler" - -- it applies to every language server without a custom handler - function(server_name) - require('lspconfig')[server_name].setup({}) - end, - - -- this is the "custom handler" for `lua_ls` - lua_ls = function() - require('lspconfig').lua_ls.setup({ - settings = { - Lua = { - runtime = { - version = 'LuaJIT', - }, - diagnostics = { - globals = { 'vim' }, - }, - workspace = { - library = { vim.env.VIMRUNTIME }, - }, - }, - }, - }) - end, - }, - }) - - local cmp = require('cmp') - - require('luasnip.loaders.from_vscode').lazy_load() - - vim.opt.completeopt = { 'menu', 'menuone', 'noselect' } - - cmp.setup({ - preselect = 'item', - completion = { - completeopt = 'menu,menuone,noinsert' - }, - window = { - documentation = cmp.config.window.bordered(), - }, - sources = { - { name = 'path' }, - { name = 'nvim_lsp' }, - { name = 'buffer', keyword_length = 3 }, - { name = 'luasnip', keyword_length = 2 }, - }, - snippet = { - expand = function(args) - require('luasnip').lsp_expand(args.body) - end, - }, - formatting = { - fields = { 'abbr', 'menu', 'kind' }, - format = function(entry, item) - local n = entry.source.name - if n == 'nvim_lsp' then - item.menu = '[LSP]' - else - item.menu = string.format('[%s]', n) - end - return item - end, - }, - mapping = cmp.mapping.preset.insert({ - -- confirm completion item - [''] = cmp.mapping.confirm({ select = false }), - - -- scroll documentation window - [''] = cmp.mapping.scroll_docs(5), - [''] = cmp.mapping.scroll_docs(-5), - - -- toggle completion menu - [''] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.abort() - else - cmp.complete() - end - end), - - -- tab complete - [''] = cmp.mapping(function(fallback) - local col = vim.fn.col('.') - 1 - - if cmp.visible() then - cmp.select_next_item({ behavior = 'select' }) - elseif col == 0 or vim.fn.getline('.'):sub(col, col):match('%s') then - fallback() - else - cmp.complete() - end - end, { 'i', 's' }), - - -- go to previous item - [''] = cmp.mapping.select_prev_item({ behavior = 'select' }), - - -- navigate to next snippet placeholder - [''] = cmp.mapping(function(fallback) - local luasnip = require('luasnip') - - if luasnip.jumpable(1) then - luasnip.jump(1) - else - fallback() - end - end, { 'i', 's' }), - - -- navigate to the previous snippet placeholder - [''] = cmp.mapping(function(fallback) - local luasnip = require('luasnip') - - if luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { 'i', 's' }), - }), - }) - end -} +return {} +-- return { +-- 'neovim/nvim-lspconfig', +-- dependencies = { +-- 'williamboman/mason.nvim', +-- 'williamboman/mason-lspconfig.nvim', +-- -- Autocompletion +-- 'hrsh7th/nvim-cmp', +-- 'hrsh7th/cmp-buffer', +-- 'hrsh7th/cmp-path', +-- 'saadparwaiz1/cmp_luasnip', +-- 'hrsh7th/cmp-nvim-lsp', +-- 'hrsh7th/cmp-nvim-lua', +-- -- Snippets +-- 'L3MON4D3/LuaSnip', +-- 'rafamadriz/friendly-snippets', +-- }, +-- config = function() +-- local autoformat_filetypes = { +-- "lua", +-- } +-- -- Create a keymap for vim.lsp.buf.implementation +-- vim.api.nvim_create_autocmd('LspAttach', { +-- callback = function(args) +-- local client = vim.lsp.get_client_by_id(args.data.client_id) +-- if not client then return end +-- if vim.tbl_contains(autoformat_filetypes, vim.bo.filetype) then +-- vim.api.nvim_create_autocmd("BufWritePre", { +-- buffer = args.buf, +-- callback = function() +-- vim.lsp.buf.format({ +-- formatting_options = { tabSize = 4, insertSpaces = true }, +-- bufnr = args.buf, +-- id = client.id +-- }) +-- end +-- }) +-- end +-- end +-- }) +-- +-- -- Add borders to floating windows +-- 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' } +-- ) +-- +-- -- Configure error/warnings interface +-- vim.diagnostic.config({ +-- virtual_text = true, +-- severity_sort = true, +-- float = { +-- style = 'minimal', +-- border = 'rounded', +-- header = '', +-- prefix = '', +-- }, +-- signs = { +-- text = { +-- [vim.diagnostic.severity.ERROR] = '✘', +-- [vim.diagnostic.severity.WARN] = '▲', +-- [vim.diagnostic.severity.HINT] = '⚑', +-- [vim.diagnostic.severity.INFO] = '»', +-- }, +-- }, +-- }) +-- +-- local lspconfig_defaults = require('lspconfig').util.default_config +-- lspconfig_defaults.capabilities = vim.tbl_deep_extend( +-- 'force', +-- lspconfig_defaults.capabilities, +-- require('cmp_nvim_lsp').default_capabilities() +-- ) +-- +-- -- This is where you enable features that only work +-- -- if there is a language server active in the file +-- vim.api.nvim_create_autocmd('LspAttach', { +-- callback = function(event) +-- local opts = { buffer = event.buf } +-- +-- vim.keymap.set('n', 'K', 'lua vim.lsp.buf.hover()', opts) +-- vim.keymap.set('n', 'gd', 'lua vim.lsp.buf.definition()', opts) +-- vim.keymap.set('n', 'gD', 'lua vim.lsp.buf.declaration()', opts) +-- vim.keymap.set('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) +-- vim.keymap.set('n', 'go', 'lua vim.lsp.buf.type_definition()', opts) +-- vim.keymap.set('n', 'gr', 'lua vim.lsp.buf.references()', opts) +-- vim.keymap.set('n', 'gs', 'lua vim.lsp.buf.signature_help()', opts) +-- vim.keymap.set('n', 'gl', 'lua vim.diagnostic.open_float()', opts) +-- vim.keymap.set('n', '', 'lua vim.lsp.buf.rename()', opts) +-- vim.keymap.set({ 'n', 'x' }, '', 'lua vim.lsp.buf.format({async = true})', opts) +-- vim.keymap.set('n', '', 'lua vim.lsp.buf.code_action()', opts) +-- end, +-- }) +-- +-- require('mason').setup({}) +-- require('mason-lspconfig').setup({ +-- ensure_installed = { +-- "lua_ls", +-- "intelephense", +-- "ts_ls", +-- "eslint", +-- "pyright", +-- }, +-- handlers = { +-- function(server_name) +-- if server_name == "luals" then return end -- avoid starting with {} +-- require('lspconfig')[server_name].setup({}) +-- end, +-- +-- lua_ls = function() +-- require('lspconfig').luals.setup({ +-- settings = { +-- Lua = { +-- runtime = { +-- version = 'LuaJIT', +-- }, +-- diagnostics = { +-- globals = { 'vim' }, +-- }, +-- workspace = { +-- library = { vim.env.VIMRUNTIME }, +-- }, +-- }, +-- }, +-- }) +-- end, +-- }, +-- }) +-- +-- local cmp = require('cmp') +-- +-- require('luasnip.loaders.from_vscode').lazy_load() +-- +-- vim.opt.completeopt = { 'menu', 'menuone', 'noselect' } +-- +-- cmp.setup({ +-- preselect = 'item', +-- completion = { +-- completeopt = 'menu,menuone,noinsert' +-- }, +-- window = { +-- documentation = cmp.config.window.bordered(), +-- }, +-- sources = { +-- { name = 'path' }, +-- { name = 'nvim_lsp' }, +-- { name = 'buffer', keyword_length = 3 }, +-- { name = 'luasnip', keyword_length = 2 }, +-- }, +-- snippet = { +-- expand = function(args) +-- require('luasnip').lsp_expand(args.body) +-- end, +-- }, +-- formatting = { +-- fields = { 'abbr', 'menu', 'kind' }, +-- format = function(entry, item) +-- local n = entry.source.name +-- if n == 'nvim_lsp' then +-- item.menu = '[LSP]' +-- else +-- item.menu = string.format('[%s]', n) +-- end +-- return item +-- end, +-- }, +-- mapping = cmp.mapping.preset.insert({ +-- -- confirm completion item +-- [''] = cmp.mapping.confirm({ select = false }), +-- +-- -- scroll documentation window +-- [''] = cmp.mapping.scroll_docs(5), +-- [''] = cmp.mapping.scroll_docs(-5), +-- +-- -- toggle completion menu +-- [''] = cmp.mapping(function(fallback) +-- if cmp.visible() then +-- cmp.abort() +-- else +-- cmp.complete() +-- end +-- end), +-- +-- -- tab complete +-- [''] = cmp.mapping(function(fallback) +-- local col = vim.fn.col('.') - 1 +-- +-- if cmp.visible() then +-- cmp.select_next_item({ behavior = 'select' }) +-- elseif col == 0 or vim.fn.getline('.'):sub(col, col):match('%s') then +-- fallback() +-- else +-- cmp.complete() +-- end +-- end, { 'i', 's' }), +-- +-- -- go to previous item +-- [''] = cmp.mapping.select_prev_item({ behavior = 'select' }), +-- +-- -- navigate to next snippet placeholder +-- [''] = cmp.mapping(function(fallback) +-- local luasnip = require('luasnip') +-- +-- if luasnip.jumpable(1) then +-- luasnip.jump(1) +-- else +-- fallback() +-- end +-- end, { 'i', 's' }), +-- +-- -- navigate to the previous snippet placeholder +-- [''] = cmp.mapping(function(fallback) +-- local luasnip = require('luasnip') +-- +-- if luasnip.jumpable(-1) then +-- luasnip.jump(-1) +-- else +-- fallback() +-- end +-- end, { 'i', 's' }), +-- }), +-- }) +-- end +-- } diff --git a/lua/plugins/orgmode.lua b/lua/plugins/orgmode.lua new file mode 100644 index 0000000..f4b36e0 --- /dev/null +++ b/lua/plugins/orgmode.lua @@ -0,0 +1,12 @@ +return { + 'nvim-orgmode/orgmode', + event = 'VeryLazy', + ft = { 'org' }, + config = function() + -- Setup orgmode + require('orgmode').setup({ + org_agenda_files = '~/orgfiles/**/*', + org_default_notes_file = '~/orgfiles/refile.org', + }) + end, +} diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index 36204da..3c10c7e 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -19,7 +19,6 @@ return { local builtin = require('telescope.builtin') vim.keymap.set('n', 'ff', builtin.find_files, {}) - vim.keymap.set('n', 'fg', builtin.git_files, {}) vim.keymap.set('n', 'fo', builtin.oldfiles, {}) vim.keymap.set('n', 'fq', builtin.quickfix, {}) vim.keymap.set('n', 'fh', builtin.help_tags, { desc = 'Telescope help tags' }) diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index defc1cf..71cbc58 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -2,9 +2,23 @@ return { { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate", + dependencies = { + "nvim-treesitter/nvim-treesitter-textobjects", + }, config = function() local configs = require("nvim-treesitter.configs") + ---@diagnostic disable-next-line: missing-fields configs.setup({ + textobjects = { + select = { + enable = true, + lookahead = true, + keymaps = { + ["af"] = "@function.outer", + ["if"] = "@function.inner", + }, + }, + }, -- enable syntax highlighting highlight = { enable = true, @@ -16,6 +30,7 @@ return { -- ensure these language parsers are installed ensure_installed = { "json", + "python", "javascript", "query", "typescript", diff --git a/plugin/lsp.lua b/plugin/lsp.lua new file mode 100644 index 0000000..95d285a --- /dev/null +++ b/plugin/lsp.lua @@ -0,0 +1,142 @@ +vim.lsp.config('*', { + root_markers = { '.git' }, +}) + +vim.diagnostic.config({ + virtual_text = true, + severity_sort = true, + float = { + style = 'minimal', + border = 'rounded', + source = 'if_many', + header = '', + prefix = '', + }, + signs = { + text = { + [vim.diagnostic.severity.ERROR] = '✘', + [vim.diagnostic.severity.WARN] = '▲', + [vim.diagnostic.severity.HINT] = '⚑', + [vim.diagnostic.severity.INFO] = '»', + }, + }, +}) +-- put early in lsp.lua +local orig = vim.lsp.util.open_floating_preview +---@diagnostic disable-next-line: duplicate-set-field +function vim.lsp.util.open_floating_preview(contents, syntax, opts, ...) + opts = opts or {} + opts.border = opts.border or 'rounded' + opts.max_width = opts.max_width or 80 + opts.max_height = opts.max_height or 24 + opts.wrap = opts.wrap ~= false + return orig(contents, syntax, opts, ...) +end + +-- 4) Per-buffer behavior on LSP attach (keymaps, auto-format, completion) +-- See :help LspAttach for the recommended pattern +vim.api.nvim_create_autocmd('LspAttach', { + group = vim.api.nvim_create_augroup('my.lsp', {}), + callback = function(args) + local client = assert(vim.lsp.get_client_by_id(args.data.client_id)) + local buf = args.buf + local map = function(mode, lhs, rhs) vim.keymap.set(mode, lhs, rhs, { buffer = buf }) end + + -- Keymaps (use builtin LSP buffer functions) + map('n', 'K', vim.lsp.buf.hover) + map('n', 'gd', vim.lsp.buf.definition) + map('n', 'gD', vim.lsp.buf.declaration) + map('n', 'gi', vim.lsp.buf.implementation) + map('n', 'go', vim.lsp.buf.type_definition) + map('n', 'gr', vim.lsp.buf.references) + map('n', 'gs', vim.lsp.buf.signature_help) + map('n', 'gl', vim.diagnostic.open_float) + map('n', '', vim.lsp.buf.rename) + map({ 'n', 'x' }, '', function() vim.lsp.buf.format({ async = true }) end) + map('n', '', vim.lsp.buf.code_action) + + -- Put near your LSP on_attach + local excluded_filetypes = { php = true } + + -- Auto-format on save (only if server can't do WillSaveWaitUntil) + if not client:supports_method('textDocument/willSaveWaitUntil') + and client:supports_method('textDocument/formatting') + and not excluded_filetypes[vim.bo[buf].filetype] + then + vim.api.nvim_create_autocmd('BufWritePre', { + group = vim.api.nvim_create_augroup('my.lsp.format', { clear = false }), + buffer = buf, + callback = function() + vim.lsp.buf.format({ bufnr = buf, id = client.id, timeout_ms = 1000 }) + end, + }) + end + end, +}) + +-- 5) Define the Lua language server config (no mason/lspconfig) +-- See :help lsp-new-config and :help vim.lsp.config() +local caps = require("cmp_nvim_lsp").default_capabilities() +vim.lsp.config['luals'] = { + cmd = { 'lua-language-server' }, + filetypes = { 'lua' }, + root_markers = { { '.luarc.json', '.luarc.jsonc' }, '.git' }, + capabilities = caps, + settings = { + Lua = { + runtime = { version = 'LuaJIT' }, + diagnostics = { globals = { 'vim' } }, + workspace = { + checkThirdParty = false, + library = vim.api.nvim_get_runtime_file('', true), + }, + telemetry = { enable = false }, + }, + }, +} + +vim.lsp.config['cssls'] = { + cmd = { 'vscode-css-language-server', '--stdio' }, + filetypes = { 'css', 'scss', 'less' }, + root_markers = { 'package.json', '.git' }, + capabilities = caps, + settings = { + css = { validate = true }, + scss = { validate = true }, + less = { validate = true }, + }, +} + +vim.lsp.config['phpls'] = { + cmd = { 'intelephense', '--stdio' }, + filetypes = { 'php' }, + root_markers = { 'composer.json', '.git' }, + capabilities = caps, + settings = { + intelephense = { + files = { + maxSize = 5000000, -- default 5MB + }, + }, + }, +} + +vim.lsp.config['ts_ls'] = { + cmd = { 'typescript-language-server', '--stdio' }, + filetypes = { + 'javascript', 'javascriptreact', 'javascript.jsx', + 'typescript', 'typescriptreact', 'typescript.tsx', + }, + root_markers = { 'package.json', 'tsconfig.json', 'jsconfig.json', '.git' }, + capabilities = caps, + settings = { + completions = { + completeFunctionCalls = true, + }, + }, +} + +vim.lsp.enable('luals') +vim.lsp.enable('cssls') +vim.lsp.enable('ts_ls') +vim.lsp.enable('phpls') diff --git a/plugin/quickformat.lua b/plugin/quickformat.lua new file mode 100644 index 0000000..038dadf --- /dev/null +++ b/plugin/quickformat.lua @@ -0,0 +1,40 @@ +local function reformat_parenthesized_content() + local bufnr = vim.api.nvim_get_current_buf() + local row = vim.api.nvim_win_get_cursor(0)[1] + local line = vim.api.nvim_buf_get_lines(bufnr, row - 1, row, false)[1] + + local inside = line:match("%((.-)%)") + if not inside then + vim.notify( + "No content found inside parentheses", + vim.log.levels.ERROR + ) + return + end + + local prefix = line:match("^(.-)%(") or "" + local suffix = line:match("%)(.*)$") or "" + + local parts = vim.split(inside, ",%s*") + if #parts == 0 then + vim.notify("No comma-separated content found", vim.log.levels.ERROR) + return + end + + local new_lines = {} + table.insert(new_lines, prefix .. "(") + for i, part in ipairs(parts) do + if i < #parts then + table.insert(new_lines, " " .. part .. ",") + else + table.insert(new_lines, " " .. part) + end + end + table.insert(new_lines, " )" .. suffix) + + vim.api.nvim_buf_set_lines(bufnr, row - 1, row, false, new_lines) +end + +vim.keymap.set("n", "qq", function() + reformat_parenthesized_content() +end)