From c2f6aa1b45bbabae2d20203bd9813ae2434f4c58 Mon Sep 17 00:00:00 2001 From: Patrick Michl Date: Fri, 8 Apr 2022 13:00:35 +0200 Subject: [PATCH] add stuff and test mr_template --- .gitlab/merge_requests_templates/default.md | 2 ++ lua/lsp.lua | 4 ++++ lua/plugins.lua | 2 ++ lua/settings.lua | 1 + 4 files changed, 9 insertions(+) create mode 100644 .gitlab/merge_requests_templates/default.md diff --git a/.gitlab/merge_requests_templates/default.md b/.gitlab/merge_requests_templates/default.md new file mode 100644 index 0000000..236bf3d --- /dev/null +++ b/.gitlab/merge_requests_templates/default.md @@ -0,0 +1,2 @@ + +/assign_reviewer @patrick.michl diff --git a/lua/lsp.lua b/lua/lsp.lua index f8b8535..ccae010 100644 --- a/lua/lsp.lua +++ b/lua/lsp.lua @@ -46,6 +46,7 @@ local on_attach = function(client, bufnr) underline = true } ) + require "lsp_signature".on_attach({doc_lines = 0}) end -- nvim-cmp supports additional completion capabilities @@ -66,6 +67,9 @@ servers.on_server_ready(function(server) if server.name == "rust_analyzer" then config.settings = require'lsp.rust' end + if server.name == "solargraph" then + server.cmd = "solargraph" + end server:setup(config) end) diff --git a/lua/plugins.lua b/lua/plugins.lua index d2b1e23..5d4ecac 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -44,10 +44,12 @@ return require('packer').startup({function() use 'xolox/vim-misc' use 'airblade/vim-gitgutter' use 'akinsho/toggleterm.nvim' + -- LSP Setup use 'neovim/nvim-lspconfig' use 'williamboman/nvim-lsp-installer' use 'nvim-lua/lsp_extensions.nvim' + use 'ray-x/lsp_signature.nvim' use 'nvim-lua/completion-nvim' use 'nvim-lua/popup.nvim' use { diff --git a/lua/settings.lua b/lua/settings.lua index 8fc5c69..e1b576e 100644 --- a/lua/settings.lua +++ b/lua/settings.lua @@ -7,6 +7,7 @@ cmd('syntax on') cmd('set number') cmd('set completeopt=menuone,noinsert,noselect') cmd('set shortmess+=c') +cmd("autocmd CursorHold,CursorHoldI *.rs :lua require'lsp_extensions'.inlay_hints{ only_current_line = true }") o.startofline = true wo.cursorline = true