diff --git a/.config/nvim/after/plugin/lspconfig.lua b/.config/nvim/after/plugin/lspconfig.lua index 78b1ce2..de6c3dc 100644 --- a/.config/nvim/after/plugin/lspconfig.lua +++ b/.config/nvim/after/plugin/lspconfig.lua @@ -24,31 +24,32 @@ lspconfig.cssls.setup { capabilities = capabilities, } lspconfig.lua_ls.setup {} --- require('roslyn').setup({ --- config = { --- settings = { --- ["csharp|inlay_hints"] = { --- csharp_enable_inlay_hints_for_implicit_object_creation = true, --- csharp_enable_inlay_hints_for_implicit_variable_types = true, --- csharp_enable_inlay_hints_for_lambda_parameter_types = true, --- csharp_enable_inlay_hints_for_types = true, --- dotnet_enable_inlay_hints_for_indexer_parameters = true, --- dotnet_enable_inlay_hints_for_literal_parameters = true, --- dotnet_enable_inlay_hints_for_object_creation_parameters = true, --- dotnet_enable_inlay_hints_for_other_parameters = true, --- dotnet_enable_inlay_hints_for_parameters = true, --- dotnet_suppress_inlay_hints_for_parameters_that_differ_only_by_suffix = true, --- dotnet_suppress_inlay_hints_for_parameters_that_match_argument_name = true, --- dotnet_suppress_inlay_hints_for_parameters_that_match_method_intent = true, --- }, --- }, --- }, --- exe = { --- "dotnet", --- vim.fs.joinpath(vim.fn.stdpath("data"), "roslyn", "Microsoft.CodeAnalysis.LanguageServer.dll"), --- }, --- filewatching = true, --- }) +vim.lsp.config('roslyn', { + settings = { + ["csharp|inlay_hints"] = { + csharp_enable_inlay_hints_for_implicit_object_creation = true, + csharp_enable_inlay_hints_for_implicit_variable_types = true, + csharp_enable_inlay_hints_for_lambda_parameter_types = true, + csharp_enable_inlay_hints_for_types = true, + dotnet_enable_inlay_hints_for_indexer_parameters = true, + dotnet_enable_inlay_hints_for_literal_parameters = true, + dotnet_enable_inlay_hints_for_object_creation_parameters = true, + dotnet_enable_inlay_hints_for_other_parameters = true, + dotnet_enable_inlay_hints_for_parameters = true, + dotnet_suppress_inlay_hints_for_parameters_that_differ_only_by_suffix = true, + dotnet_suppress_inlay_hints_for_parameters_that_match_argument_name = true, + dotnet_suppress_inlay_hints_for_parameters_that_match_method_intent = true, + }, + }, +}) + +require('roslyn').setup({ + exe = { + "dotnet", + vim.fs.joinpath(vim.fn.stdpath("data"), "roslyn", "Microsoft.CodeAnalysis.LanguageServer.dll"), + }, + filewatching = true, +}) vim.api.nvim_create_autocmd('LspAttach', { @@ -63,7 +64,14 @@ vim.api.nvim_create_autocmd('LspAttach', { vim.keymap.set('n', 'gi', function() vim.lsp.buf.implementation() end, opts) vim.keymap.set('n', '[d', function() vim.diagnostic.goto_next() end, opts) vim.keymap.set('n', ']d', function() vim.diagnostic.goto_prev() end, opts) - vim.keymap.set('n', 'vca', function() vim.lsp.buf.code_action() end, opts) + vim.keymap.set('n', 'vca', function() + vim.lsp.buf.code_action({ + context = { + diagnostics = vim.diagnostic.get(0), + only = { 'quickfix', 'refactor', 'source' } + } + }) + end, opts) vim.keymap.set('n', 'vrr', function() vim.lsp.buf.references() end, opts) vim.keymap.set('n', 'vrn', function() vim.lsp.buf.rename() end, opts) vim.keymap.set('i', '', function() vim.lsp.buf.signature_help() end, opts) @@ -71,29 +79,6 @@ vim.api.nvim_create_autocmd('LspAttach', { end, }) --- require('blink').setup({ --- cmp = { --- sources = { --- { name = 'lsp' }, --- { name = 'buffer' }, --- { name = 'path' }, --- { name = 'snippets' }, --- }, --- mapping = { --- [''] = 'select_next', --- [''] = 'select_prev', --- [''] = 'confirm', --- [''] = 'trigger', --- }, --- snippets = { --- expand = function(args) --- -- Optional: integrate with luasnip if you still use it --- require('luasnip').lsp_expand(args.body) --- end --- } --- } --- }) - local cmp = require('cmp') local cmp_select = { behavior = cmp.SelectBehavior.Select } diff --git a/.config/nvim/after/plugin/mason-lspconfig.lua b/.config/nvim/after/plugin/mason-lspconfig.lua index 7baee14..9ccee23 100644 --- a/.config/nvim/after/plugin/mason-lspconfig.lua +++ b/.config/nvim/after/plugin/mason-lspconfig.lua @@ -3,6 +3,7 @@ require("mason-lspconfig").setup { ensure_installed = { "lua_ls", "cssls", "angularls", + "roslyn", "gopls", "ts_ls", "eslint" }, diff --git a/.config/nvim/after/plugin/mason.lua b/.config/nvim/after/plugin/mason.lua new file mode 100644 index 0000000..12d8f1f --- /dev/null +++ b/.config/nvim/after/plugin/mason.lua @@ -0,0 +1,6 @@ +require("mason").setup({ + registries = { + "github:mason-org/mason-registry", + "github:Crashdummyy/mason-registry", + }, +}) diff --git a/.config/nvim/after/plugin/telescope.lua b/.config/nvim/after/plugin/telescope.lua index 783798d..add9241 100644 --- a/.config/nvim/after/plugin/telescope.lua +++ b/.config/nvim/after/plugin/telescope.lua @@ -1,6 +1,16 @@ +require('telescope').setup { + extensions = { + ["ui_select"] = { + require('telescope.themes').get_dropdown { + } + } + } +} +require('telescope').load_extension('ui-select') + local builtin = require('telescope.builtin') vim.keymap.set('n', 'pf', builtin.find_files, {}) vim.keymap.set('n', 'p', builtin.git_files, {}) vim.keymap.set('n', 'ps', function() - builtin.grep_string({ search = vim.fn.input("Grep > ") }); + builtin.grep_string({ search = vim.fn.input("Grep > ") }); end) diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 3279b22..7b0c6e9 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,23 +1,24 @@ { "LuaSnip": { "branch": "master", "commit": "de10d8414235b0a8cabfeba60d07c24304e71f5c" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dotnet.nvim": { "branch": "main", "commit": "f5c52f9f52a3d8ca8dff6916c2228fb41a075274" }, - "everforest-nvim": { "branch": "main", "commit": "2eb7c348f880ba93de4d98cae049c9441f5d4d49" }, + "everforest-nvim": { "branch": "main", "commit": "8db2bd8af38ed7b1bd12baa9a28858ff92e839bf" }, "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "7f0bf635082bb9b7d2b37766054526a6ccafdb85" }, + "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "1ec4da522fa49dcecee8d190efda273464dd2192" }, "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, - "neogit": { "branch": "master", "commit": "b8d840ed988ec3751ea2d9c9a66f635c3439564a" }, + "neogit": { "branch": "master", "commit": "802f387b7a44731db2b5f3c0b605ae388b883f1d" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-lspconfig": { "branch": "master", "commit": "9141be4c1332afc83bdf1b0278dbb030f75ff8e3" }, + "nvim-lspconfig": { "branch": "master", "commit": "aaa807fb2ea8d3caf41c153a174c6b7e472a8428" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-web-devicons": { "branch": "master", "commit": "3362099de3368aa620a8105b19ed04c2053e38c0" }, + "nvim-web-devicons": { "branch": "master", "commit": "c2599a81ecabaae07c49ff9b45dcd032a8d90f1a" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "roslyn.nvim": { "branch": "main", "commit": "3b5b6c687ecaeccbac7652673385511a3deba7bb" }, - "smear-cursor.nvim": { "branch": "main", "commit": "58e69a911e7f5296b3d7fec5e7414df5a4ac91fb" }, + "roslyn.nvim": { "branch": "main", "commit": "0c4a6f5b64122b51a64e0c8f7aae140ec979690e" }, + "smear-cursor.nvim": { "branch": "main", "commit": "4b86df8a0c5f46e708616b21a02493bb0e47ecbd" }, + "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, "undotree": { "branch": "master", "commit": "28f2f54a34baff90ea6f4a735ef1813ad875c743" }, "vim-merginal": { "branch": "develop", "commit": "3dca10fd8bce10edbc2024651db4ffb6dd2d89de" } diff --git a/.config/nvim/lua/wicked/lazy.lua b/.config/nvim/lua/wicked/lazy.lua index bd5ac42..d4c789a 100644 --- a/.config/nvim/lua/wicked/lazy.lua +++ b/.config/nvim/lua/wicked/lazy.lua @@ -32,6 +32,7 @@ require("lazy").setup({ 'nvim-treesitter/nvim-treesitter', 'theprimeagen/harpoon', 'mbbill/undotree', + 'nvim-telescope/telescope-ui-select.nvim', 'idanarye/vim-merginal', "sphamba/smear-cursor.nvim", 'williamboman/mason.nvim', diff --git a/.vim/undodir/%home%rmaco%projects%setup%.config%nvim%after%plugin%lspconfig.lua b/.vim/undodir/%home%rmaco%projects%setup%.config%nvim%after%plugin%lspconfig.lua index cf0f5fe..d63628c 100644 Binary files a/.vim/undodir/%home%rmaco%projects%setup%.config%nvim%after%plugin%lspconfig.lua and b/.vim/undodir/%home%rmaco%projects%setup%.config%nvim%after%plugin%lspconfig.lua differ diff --git a/.vim/undodir/%home%rmaco%projects%setup%.config%nvim%after%plugin%mason-lspconfig.lua b/.vim/undodir/%home%rmaco%projects%setup%.config%nvim%after%plugin%mason-lspconfig.lua index 610e63b..77a0c51 100644 Binary files a/.vim/undodir/%home%rmaco%projects%setup%.config%nvim%after%plugin%mason-lspconfig.lua and b/.vim/undodir/%home%rmaco%projects%setup%.config%nvim%after%plugin%mason-lspconfig.lua differ diff --git a/.vim/undodir/%home%rmaco%projects%setup%.config%nvim%after%plugin%mason.lua b/.vim/undodir/%home%rmaco%projects%setup%.config%nvim%after%plugin%mason.lua index f0b43c0..78e9e07 100644 Binary files a/.vim/undodir/%home%rmaco%projects%setup%.config%nvim%after%plugin%mason.lua and b/.vim/undodir/%home%rmaco%projects%setup%.config%nvim%after%plugin%mason.lua differ diff --git a/.vim/undodir/%home%rmaco%projects%setup%.config%nvim%lua%wicked%lazy.lua b/.vim/undodir/%home%rmaco%projects%setup%.config%nvim%lua%wicked%lazy.lua index 29a728d..c529b7f 100644 Binary files a/.vim/undodir/%home%rmaco%projects%setup%.config%nvim%lua%wicked%lazy.lua and b/.vim/undodir/%home%rmaco%projects%setup%.config%nvim%lua%wicked%lazy.lua differ