diff options
| -rw-r--r-- | nvim/completion.lua | 6 | ||||
| -rw-r--r-- | nvim/lsp.lua | 60 |
2 files changed, 33 insertions, 33 deletions
diff --git a/nvim/completion.lua b/nvim/completion.lua index d477367..4b7f335 100644 --- a/nvim/completion.lua +++ b/nvim/completion.lua | |||
| @@ -5,9 +5,10 @@ vim.api.nvim_create_autocmd("LspAttach", { | |||
| 5 | vim.lsp.completion.enable(true, client.id, ev.buf, { autotrigger = true }) | 5 | vim.lsp.completion.enable(true, client.id, ev.buf, { autotrigger = true }) |
| 6 | end | 6 | end |
| 7 | 7 | ||
| 8 | if client and not client:supports_method('textDocument/willSaveWaitUntil') and client:supports_method('textDocument/formatting') then | 8 | if client and not client:supports_method('textDocument/willSaveWaitUntil') and |
| 9 | client:supports_method('textDocument/formatting') then | ||
| 9 | vim.api.nvim_create_autocmd('BufWritePre', { | 10 | vim.api.nvim_create_autocmd('BufWritePre', { |
| 10 | group = vim.api.nvim_create_augroup('my.lsp', {clear=false}), | 11 | group = vim.api.nvim_create_augroup('my.lsp', { clear = false }), |
| 11 | buffer = ev.buf, | 12 | buffer = ev.buf, |
| 12 | callback = function() | 13 | callback = function() |
| 13 | vim.lsp.buf.format({ bufnr = ev.buf, id = client.id, timeout_ms = 1000 }) | 14 | vim.lsp.buf.format({ bufnr = ev.buf, id = client.id, timeout_ms = 1000 }) |
| @@ -18,4 +19,3 @@ vim.api.nvim_create_autocmd("LspAttach", { | |||
| 18 | }) | 19 | }) |
| 19 | 20 | ||
| 20 | vim.o.winborder = 'rounded' | 21 | vim.o.winborder = 'rounded' |
| 21 | |||
diff --git a/nvim/lsp.lua b/nvim/lsp.lua index 299dedc..fbb5066 100644 --- a/nvim/lsp.lua +++ b/nvim/lsp.lua | |||
| @@ -1,43 +1,44 @@ | |||
| 1 | vim.lsp.config.clangd = { | 1 | vim.lsp.config.clangd = { |
| 2 | cmd = { '/usr/local/bin/clangd19', '--background-index', '--function-arg-placeholders' }, | 2 | cmd = { '/usr/local/bin/clangd19', '--background-index', '--function-arg-placeholders' }, |
| 3 | root_markers = { 'compile_commands.json', 'compile_flags.txt' }, | 3 | root_markers = { 'compile_commands.json', 'compile_flags.txt' }, |
| 4 | filetypes = { 'c', 'cpp' }, | 4 | filetypes = { 'c', 'cpp' }, |
| 5 | } | 5 | } |
| 6 | 6 | ||
| 7 | vim.lsp.config.lua_ls = { | 7 | vim.lsp.config.lua_ls = { |
| 8 | settings = { | 8 | settings = { |
| 9 | Lua = { | 9 | Lua = { |
| 10 | runtime = { | 10 | runtime = { |
| 11 | version = 'LuaJIT', | 11 | version = 'LuaJIT', |
| 12 | }, | 12 | }, |
| 13 | diagnostics = { | 13 | diagnostics = { |
| 14 | globals = {'vim'}, | 14 | globals = { 'vim' }, |
| 15 | }, | 15 | }, |
| 16 | workspace = { | 16 | workspace = { |
| 17 | library = vim.api.nvim_get_runtime_file("", true), | 17 | library = vim.api.nvim_get_runtime_file("", true), |
| 18 | }, | 18 | }, |
| 19 | telemetry = { | 19 | telemetry = { |
| 20 | enable = false, | 20 | enable = false, |
| 21 | }, | 21 | }, |
| 22 | }, | 22 | }, |
| 23 | } | 23 | } |
| 24 | } | 24 | } |
| 25 | 25 | ||
| 26 | local project_library_path = "/home/t/.local/lib/node_modules" | 26 | local project_library_path = "/home/t/.local/lib/node_modules" |
| 27 | local ng_cmd = {"ngserver", "--stdio", "--tsProbeLocations", project_library_path , "--ngProbeLocations", project_library_path} | 27 | local ng_cmd = { "ngserver", "--stdio", "--tsProbeLocations", project_library_path, "--ngProbeLocations", |
| 28 | project_library_path } | ||
| 28 | 29 | ||
| 29 | vim.lsp.config.angularls = { | 30 | vim.lsp.config.angularls = { |
| 30 | cmd = ng_cmd, | 31 | cmd = ng_cmd, |
| 31 | on_new_config = function(new_config,new_root_dir) | 32 | on_new_config = function(new_config, new_root_dir) |
| 32 | new_config.cmd = ng_cmd | 33 | new_config.cmd = ng_cmd |
| 33 | end, | 34 | end, |
| 34 | } | 35 | } |
| 35 | 36 | ||
| 36 | vim.lsp.config.markdown_oxide = { | 37 | vim.lsp.config.markdown_oxide = { |
| 37 | on_attach = on_attach, | 38 | on_attach = on_attach, |
| 38 | cmd = { | 39 | cmd = { |
| 39 | 'markdown-oxide' | 40 | 'markdown-oxide' |
| 40 | } | 41 | } |
| 41 | } | 42 | } |
| 42 | 43 | ||
| 43 | vim.lsp.enable({ | 44 | vim.lsp.enable({ |
| @@ -55,6 +56,5 @@ vim.lsp.enable({ | |||
| 55 | 56 | ||
| 56 | vim.diagnostic.config({ | 57 | vim.diagnostic.config({ |
| 57 | virtual_text = true, | 58 | virtual_text = true, |
| 58 | virtual_lines = true | 59 | -- virtual_lines = true |
| 59 | }) | 60 | }) |
| 60 | |||
