cleanup
This commit is contained in:
		
							parent
							
								
									6f5951689e
								
							
						
					
					
						commit
						45ba7555e5
					
				|  | @ -10,9 +10,10 @@ | ||||||
|   "fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" }, |   "fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" }, | ||||||
|   "friendly-snippets": { "branch": "main", "commit": "e11b09bf10706bb74e16e4c3d11b2274d62e687f" }, |   "friendly-snippets": { "branch": "main", "commit": "e11b09bf10706bb74e16e4c3d11b2274d62e687f" }, | ||||||
|   "gitsigns.nvim": { "branch": "main", "commit": "e31d2149d9f3fb056bfd5b3416b2e818be10aabe" }, |   "gitsigns.nvim": { "branch": "main", "commit": "e31d2149d9f3fb056bfd5b3416b2e818be10aabe" }, | ||||||
|  |   "godot.nvim": { "branch": "main", "commit": "9a2d631c6a6313553dbd66f749ed3bc99bd4b4a9" }, | ||||||
|   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" }, |   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" }, | ||||||
|   "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, |   "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, | ||||||
|   "lazy.nvim": { "branch": "main", "commit": "0fc34a0cf5f5f6f998a0897119a7d846b47eaa9d" }, |   "lazy.nvim": { "branch": "main", "commit": "8f6225751138329da339eb6554d40158768d23ff" }, | ||||||
|   "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, |   "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, | ||||||
|   "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, |   "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, | ||||||
|   "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, |   "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, | ||||||
|  | @ -26,7 +27,7 @@ | ||||||
|   "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, |   "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, | ||||||
|   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, |   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, | ||||||
|   "supermaven-nvim": { "branch": "main", "commit": "ef3bd1a6b6f722857f2f88d929dd4ac875655611" }, |   "supermaven-nvim": { "branch": "main", "commit": "ef3bd1a6b6f722857f2f88d929dd4ac875655611" }, | ||||||
|   "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, |   "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, | ||||||
|   "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, |   "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, | ||||||
|   "templ.vim": { "branch": "main", "commit": "5cc48b93a4538adca0003c4bc27af844bb16ba24" }, |   "templ.vim": { "branch": "main", "commit": "5cc48b93a4538adca0003c4bc27af844bb16ba24" }, | ||||||
|   "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" }, |   "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" }, | ||||||
|  |  | ||||||
|  | @ -1,186 +0,0 @@ | ||||||
| -- https://raw.githubusercontent.com/neoclide/coc.nvim/master/doc/coc-example-config.lua |  | ||||||
| 
 |  | ||||||
| -- Some servers have issues with backup files, see #649 |  | ||||||
| vim.opt.backup = false |  | ||||||
| vim.opt.writebackup = false |  | ||||||
| 
 |  | ||||||
| -- Having longer updatetime (default is 4000 ms = 4s) leads to noticeable |  | ||||||
| -- delays and poor user experience |  | ||||||
| vim.opt.updatetime = 300 |  | ||||||
| 
 |  | ||||||
| -- Always show the signcolumn, otherwise it would shift the text each time |  | ||||||
| -- diagnostics appeared/became resolved |  | ||||||
| vim.opt.signcolumn = "yes" |  | ||||||
| 
 |  | ||||||
| local keyset = vim.keymap.set |  | ||||||
| -- Autocomplete |  | ||||||
| function _G.check_back_space() |  | ||||||
|     local col = vim.fn.col('.') - 1 |  | ||||||
|     return col == 0 or vim.fn.getline('.'):sub(col, col):match('%s') ~= nil |  | ||||||
| end |  | ||||||
| 
 |  | ||||||
| -- Use Tab for trigger completion with characters ahead and navigate |  | ||||||
| -- NOTE: There's always a completion item selected by default, you may want to enable |  | ||||||
| -- no select by setting `"suggest.noselect": true` in your configuration file |  | ||||||
| -- NOTE: Use command ':verbose imap <tab>' to make sure Tab is not mapped by |  | ||||||
| -- other plugins before putting this into your config |  | ||||||
| local opts = {silent = true, noremap = true, expr = true, replace_keycodes = false} |  | ||||||
| keyset("i", "<TAB>", 'coc#pum#visible() ? coc#pum#next(1) : v:lua.check_back_space() ? "<TAB>" : coc#refresh()', opts) |  | ||||||
| keyset("i", "<S-TAB>", [[coc#pum#visible() ? coc#pum#prev(1) : "\<C-h>"]], opts) |  | ||||||
| 
 |  | ||||||
| -- Make <CR> to accept selected completion item or notify coc.nvim to format |  | ||||||
| -- <C-g>u breaks current undo, please make your own choice |  | ||||||
| keyset("i", "<cr>", [[coc#pum#visible() ? coc#pum#confirm() : "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"]], opts) |  | ||||||
| 
 |  | ||||||
| -- Use <c-j> to trigger snippets |  | ||||||
| keyset("i", "<c-j>", "<Plug>(coc-snippets-expand-jump)") |  | ||||||
| -- Use <c-space> to trigger completion |  | ||||||
| keyset("i", "<c-space>", "coc#refresh()", {silent = true, expr = true}) |  | ||||||
| 
 |  | ||||||
| -- Use `[g` and `]g` to navigate diagnostics |  | ||||||
| -- Use `:CocDiagnostics` to get all diagnostics of current buffer in location list |  | ||||||
| keyset("n", "[g", "<Plug>(coc-diagnostic-prev)", {silent = true}) |  | ||||||
| keyset("n", "]g", "<Plug>(coc-diagnostic-next)", {silent = true}) |  | ||||||
| 
 |  | ||||||
| -- GoTo code navigation |  | ||||||
| keyset("n", "gd", "<Plug>(coc-definition)", {silent = true}) |  | ||||||
| keyset("n", "gy", "<Plug>(coc-type-definition)", {silent = true}) |  | ||||||
| keyset("n", "gi", "<Plug>(coc-implementation)", {silent = true}) |  | ||||||
| keyset("n", "gr", "<Plug>(coc-references)", {silent = true}) |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| -- Use K to show documentation in preview window |  | ||||||
| function _G.show_docs() |  | ||||||
|     local cw = vim.fn.expand('<cword>') |  | ||||||
|     if vim.fn.index({'vim', 'help'}, vim.bo.filetype) >= 0 then |  | ||||||
|         vim.api.nvim_command('h ' .. cw) |  | ||||||
|     elseif vim.api.nvim_eval('coc#rpc#ready()') then |  | ||||||
|         vim.fn.CocActionAsync('doHover') |  | ||||||
|     else |  | ||||||
|         vim.api.nvim_command('!' .. vim.o.keywordprg .. ' ' .. cw) |  | ||||||
|     end |  | ||||||
| end |  | ||||||
| keyset("n", "K", '<CMD>lua _G.show_docs()<CR>', {silent = true}) |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| -- Highlight the symbol and its references on a CursorHold event(cursor is idle) |  | ||||||
| vim.api.nvim_create_augroup("CocGroup", {}) |  | ||||||
| vim.api.nvim_create_autocmd("CursorHold", { |  | ||||||
|     group = "CocGroup", |  | ||||||
|     command = "silent call CocActionAsync('highlight')", |  | ||||||
|     desc = "Highlight symbol under cursor on CursorHold" |  | ||||||
| }) |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| -- Symbol renaming |  | ||||||
| keyset("n", "<leader>rn", "<Plug>(coc-rename)", {silent = true}) |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| -- Formatting selected code |  | ||||||
| keyset("x", "<leader>f", "<Plug>(coc-format-selected)", {silent = true}) |  | ||||||
| keyset("n", "<leader>f", "<Plug>(coc-format-selected)", {silent = true}) |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| -- Setup formatexpr specified filetype(s) |  | ||||||
| vim.api.nvim_create_autocmd("FileType", { |  | ||||||
|     group = "CocGroup", |  | ||||||
|     pattern = "typescript,json", |  | ||||||
|     command = "setl formatexpr=CocAction('formatSelected')", |  | ||||||
|     desc = "Setup formatexpr specified filetype(s)." |  | ||||||
| }) |  | ||||||
| 
 |  | ||||||
| -- Update signature help on jump placeholder |  | ||||||
| vim.api.nvim_create_autocmd("User", { |  | ||||||
|     group = "CocGroup", |  | ||||||
|     pattern = "CocJumpPlaceholder", |  | ||||||
|     command = "call CocActionAsync('showSignatureHelp')", |  | ||||||
|     desc = "Update signature help on jump placeholder" |  | ||||||
| }) |  | ||||||
| 
 |  | ||||||
| -- Apply codeAction to the selected region |  | ||||||
| -- Example: `<leader>aap` for current paragraph |  | ||||||
| local opts = {silent = true, nowait = true} |  | ||||||
| keyset("x", "<leader>a", "<Plug>(coc-codeaction-selected)", opts) |  | ||||||
| keyset("n", "<leader>a", "<Plug>(coc-codeaction-selected)", opts) |  | ||||||
| 
 |  | ||||||
| -- Remap keys for apply code actions at the cursor position. |  | ||||||
| keyset("n", "<leader>ac", "<Plug>(coc-codeaction-cursor)", opts) |  | ||||||
| -- Remap keys for apply source code actions for current file. |  | ||||||
| keyset("n", "<leader>as", "<Plug>(coc-codeaction-source)", opts) |  | ||||||
| -- Apply the most preferred quickfix action on the current line. |  | ||||||
| keyset("n", "<leader>qf", "<Plug>(coc-fix-current)", opts) |  | ||||||
| 
 |  | ||||||
| -- Remap keys for apply refactor code actions. |  | ||||||
| keyset("n", "<leader>re", "<Plug>(coc-codeaction-refactor)", { silent = true }) |  | ||||||
| keyset("x", "<leader>r", "<Plug>(coc-codeaction-refactor-selected)", { silent = true }) |  | ||||||
| keyset("n", "<leader>r", "<Plug>(coc-codeaction-refactor-selected)", { silent = true }) |  | ||||||
| 
 |  | ||||||
| -- Run the Code Lens actions on the current line |  | ||||||
| keyset("n", "<leader>cl", "<Plug>(coc-codelens-action)", opts) |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| -- Map function and class text objects |  | ||||||
| -- NOTE: Requires 'textDocument.documentSymbol' support from the language server |  | ||||||
| keyset("x", "if", "<Plug>(coc-funcobj-i)", opts) |  | ||||||
| keyset("o", "if", "<Plug>(coc-funcobj-i)", opts) |  | ||||||
| keyset("x", "af", "<Plug>(coc-funcobj-a)", opts) |  | ||||||
| keyset("o", "af", "<Plug>(coc-funcobj-a)", opts) |  | ||||||
| keyset("x", "ic", "<Plug>(coc-classobj-i)", opts) |  | ||||||
| keyset("o", "ic", "<Plug>(coc-classobj-i)", opts) |  | ||||||
| keyset("x", "ac", "<Plug>(coc-classobj-a)", opts) |  | ||||||
| keyset("o", "ac", "<Plug>(coc-classobj-a)", opts) |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| -- Remap <C-f> and <C-b> to scroll float windows/popups |  | ||||||
| ---@diagnostic disable-next-line: redefined-local |  | ||||||
| local opts = {silent = true, nowait = true, expr = true} |  | ||||||
| keyset("n", "<C-f>", 'coc#float#has_scroll() ? coc#float#scroll(1) : "<C-f>"', opts) |  | ||||||
| keyset("n", "<C-b>", 'coc#float#has_scroll() ? coc#float#scroll(0) : "<C-b>"', opts) |  | ||||||
| keyset("i", "<C-f>", |  | ||||||
|        'coc#float#has_scroll() ? "<c-r>=coc#float#scroll(1)<cr>" : "<Right>"', opts) |  | ||||||
| keyset("i", "<C-b>", |  | ||||||
|        'coc#float#has_scroll() ? "<c-r>=coc#float#scroll(0)<cr>" : "<Left>"', opts) |  | ||||||
| keyset("v", "<C-f>", 'coc#float#has_scroll() ? coc#float#scroll(1) : "<C-f>"', opts) |  | ||||||
| keyset("v", "<C-b>", 'coc#float#has_scroll() ? coc#float#scroll(0) : "<C-b>"', opts) |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| -- Use CTRL-S for selections ranges |  | ||||||
| -- Requires 'textDocument/selectionRange' support of language server |  | ||||||
| keyset("n", "<C-s>", "<Plug>(coc-range-select)", {silent = true}) |  | ||||||
| keyset("x", "<C-s>", "<Plug>(coc-range-select)", {silent = true}) |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| -- Add `:Format` command to format current buffer |  | ||||||
| vim.api.nvim_create_user_command("Format", "call CocAction('format')", {}) |  | ||||||
| 
 |  | ||||||
| -- " Add `:Fold` command to fold current buffer |  | ||||||
| vim.api.nvim_create_user_command("Fold", "call CocAction('fold', <f-args>)", {nargs = '?'}) |  | ||||||
| 
 |  | ||||||
| -- Add `:OR` command for organize imports of the current buffer |  | ||||||
| vim.api.nvim_create_user_command("OR", "call CocActionAsync('runCommand', 'editor.action.organizeImport')", {}) |  | ||||||
| 
 |  | ||||||
| -- Add (Neo)Vim's native statusline support |  | ||||||
| -- NOTE: Please see `:h coc-status` for integrations with external plugins that |  | ||||||
| -- provide custom statusline: lightline.vim, vim-airline |  | ||||||
| vim.opt.statusline:prepend("%{coc#status()}%{get(b:,'coc_current_function','')}") |  | ||||||
| 
 |  | ||||||
| -- Mappings for CoCList |  | ||||||
| -- code actions and coc stuff |  | ||||||
| ---@diagnostic disable-next-line: redefined-local |  | ||||||
| local opts = {silent = true, nowait = true} |  | ||||||
| -- Show all diagnostics |  | ||||||
| keyset("n", "<space>a", ":<C-u>CocList diagnostics<cr>", opts) |  | ||||||
| -- Manage extensions |  | ||||||
| keyset("n", "<space>e", ":<C-u>CocList extensions<cr>", opts) |  | ||||||
| -- Show commands |  | ||||||
| keyset("n", "<space>c", ":<C-u>CocList commands<cr>", opts) |  | ||||||
| -- Find symbol of current document |  | ||||||
| keyset("n", "<space>o", ":<C-u>CocList outline<cr>", opts) |  | ||||||
| -- Search workspace symbols |  | ||||||
| keyset("n", "<space>s", ":<C-u>CocList -I symbols<cr>", opts) |  | ||||||
| -- Do default action for next item |  | ||||||
| keyset("n", "<space>j", ":<C-u>CocNext<cr>", opts) |  | ||||||
| -- Do default action for previous item |  | ||||||
| keyset("n", "<space>k", ":<C-u>CocPrev<cr>", opts) |  | ||||||
| -- Resume latest coc list |  | ||||||
| keyset("n", "<space>p", ":<C-u>CocListResume<cr>", opts) |  | ||||||
|  | @ -8,5 +8,4 @@ require("lorenz.cmp") | ||||||
| require("lorenz.catppuccin") | require("lorenz.catppuccin") | ||||||
| require("lorenz.harpoon") | require("lorenz.harpoon") | ||||||
| require("lorenz.lualine") | require("lorenz.lualine") | ||||||
| require("lorenz.coc") |  | ||||||
| require("lorenz.eslint") | require("lorenz.eslint") | ||||||
|  |  | ||||||
|  | @ -45,3 +45,10 @@ lspconfig.unocss.setup{ | ||||||
|   capabilities = capabilities, |   capabilities = capabilities, | ||||||
|   filetypes = { "html", "javascriptreact", "rescript", "typescriptreact", "vue", "svelte", "templ"} |   filetypes = { "html", "javascriptreact", "rescript", "typescriptreact", "vue", "svelte", "templ"} | ||||||
| } | } | ||||||
|  | 
 | ||||||
|  | lspconfig.gdscript.setup{ | ||||||
|  |     on_attach = on_attach, | ||||||
|  |     flags = { | ||||||
|  |       debounce_text_changes = 150, | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue