diff --git a/.config/nvim/after/plugin/lspconfig.lua b/.config/nvim/after/plugin/lspconfig.lua index de6c3dc..1e5555c 100644 --- a/.config/nvim/after/plugin/lspconfig.lua +++ b/.config/nvim/after/plugin/lspconfig.lua @@ -1,56 +1,16 @@ -local lspconfig = require('lspconfig') - -local project_library_path = vim.fn.getcwd() .. '/node_modules' -local angular_cmd = { - 'ngserver', - '--stdio', - '--tsProbeLocations', - project_library_path, - '--ngProbeLocations', - project_library_path .. '@angular/language-server' -} - -lspconfig.ts_ls.setup {} -lspconfig.angularls.setup({ - cmd = angular_cmd, - on_new_config = function(new_config, new_root_dir) - new_config.cmd = angular_cmd - end -}) - local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities.textDocument.completion.completionItem.snippetSupport = true -lspconfig.cssls.setup { - capabilities = capabilities, -} -lspconfig.lua_ls.setup {} -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.lsp.config("*", { + capabilities = capabilities }) +vim.lsp.config("ts_ls", {}) +vim.lsp.config("ruff", {}) +vim.lsp.config("cssls", {}) +vim.lsp.config("lua_ls", {}) +vim.lsp.config("odoo_ls", {}) +vim.lsp.enable({"odoo_ls", "ts_ls", "ruff", "cssls", "lua_ls"}) vim.api.nvim_create_autocmd('LspAttach', { group = vim.api.nvim_create_augroup('user_lsp_attach', { clear = true }), @@ -103,4 +63,4 @@ cmp.setup({ }, }) -vim.cmd [[autocmd BufWritePre * lua vim.lsp.buf.format()]] +-- vim.cmd [[autocmd BufWritePre * lua vim.lsp.buf.format()]] diff --git a/.config/nvim/after/plugin/mason-lspconfig.lua b/.config/nvim/after/plugin/mason-lspconfig.lua index 9ccee23..d3a3e50 100644 --- a/.config/nvim/after/plugin/mason-lspconfig.lua +++ b/.config/nvim/after/plugin/mason-lspconfig.lua @@ -2,9 +2,5 @@ require('mason').setup {} require("mason-lspconfig").setup { ensure_installed = { "lua_ls", "cssls", - "angularls", - "roslyn", - "gopls", - "ts_ls", "eslint" }, } diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 7b0c6e9..48bde3c 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,25 +1,25 @@ { - "LuaSnip": { "branch": "master", "commit": "de10d8414235b0a8cabfeba60d07c24304e71f5c" }, + "LuaSnip": { "branch": "master", "commit": "73813308abc2eaeff2bc0d3f2f79270c491be9d7" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dotnet.nvim": { "branch": "main", "commit": "f5c52f9f52a3d8ca8dff6916c2228fb41a075274" }, - "everforest-nvim": { "branch": "main", "commit": "8db2bd8af38ed7b1bd12baa9a28858ff92e839bf" }, + "everforest-nvim": { "branch": "main", "commit": "d2936185a6d266def29fd7b523d296384580ef08" }, "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "1ec4da522fa49dcecee8d190efda273464dd2192" }, - "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, - "neogit": { "branch": "master", "commit": "802f387b7a44731db2b5f3c0b605ae388b883f1d" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "f760507df8c49a4bf46a4d12e1fc616797508979" }, + "mason.nvim": { "branch": "main", "commit": "b3689a41dd77e5294498dba9757fb22cc80cbebd" }, + "neogit": { "branch": "master", "commit": "90dcfa7b2bd5f3f35d1a7afe24dde9e2bc482cd4" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-lspconfig": { "branch": "master", "commit": "aaa807fb2ea8d3caf41c153a174c6b7e472a8428" }, + "nvim-lspconfig": { "branch": "master", "commit": "a844e89ea0e0e4b207ec550c3b51fb6e471881a4" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-web-devicons": { "branch": "master", "commit": "c2599a81ecabaae07c49ff9b45dcd032a8d90f1a" }, + "nvim-web-devicons": { "branch": "master", "commit": "b8221e42cf7287c4dcde81f232f58d7b947c210d" }, + "odoo-neovim": { "branch": "main-default-whe", "commit": "24f06b2eb090086d888e44d229dc2b422014b2f8" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "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" }, + "undotree": { "branch": "master", "commit": "0f1c9816975b5d7f87d5003a19c53c6fd2ff6f7f" }, "vim-merginal": { "branch": "develop", "commit": "3dca10fd8bce10edbc2024651db4ffb6dd2d89de" } } diff --git a/.config/nvim/lua/wicked/lazy.lua b/.config/nvim/lua/wicked/lazy.lua index d4c789a..7a23512 100644 --- a/.config/nvim/lua/wicked/lazy.lua +++ b/.config/nvim/lua/wicked/lazy.lua @@ -29,6 +29,7 @@ require("lazy").setup({ end }, + 'macocianradu/odoo-neovim', 'nvim-treesitter/nvim-treesitter', 'theprimeagen/harpoon', 'mbbill/undotree', @@ -44,7 +45,6 @@ require("lazy").setup({ }, config = true }, - 'seblj/roslyn.nvim', 'neovim/nvim-lspconfig', { 'nvim-lualine/lualine.nvim',