From 908a317e233eb09d245208af530706c919b04ad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harouna=20Traor=C3=A9?= Date: Tue, 24 Oct 2023 19:04:10 +0200 Subject: [PATCH] prevent conflicts with stylelint lsp --- init.lua | 13 ++++++------- lazy-lock.json | 10 +++++----- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/init.lua b/init.lua index e86996fb..731d1ab5 100644 --- a/init.lua +++ b/init.lua @@ -524,9 +524,7 @@ local servers = { cssls = {}, cssmodules_ls = {}, cucumber_language_server = {}, - denols = { - root_dir = nvim_lsp.util.root_pattern('deno.json', 'deno.jsonc') - }, + denols = {}, diagnosticls = {}, docker_compose_language_service = {}, dockerls = {}, @@ -541,12 +539,12 @@ local servers = { }, }, rust_analyzer = {}, - stylelint_lsp = {}, + stylelint_lsp = { + filetypes = { 'css', 'less', 'scss', 'sugarss', 'vue', 'wxss' } + }, svelte = {}, tailwindcss = {}, - tsserver = { - root_dir = nvim_lsp.util.root_pattern('package.json', 'tsconfig.json', 'jsconfig.json'), - }, + tsserver = {}, vimls = {}, vuels = {}, yamlls = {}, @@ -573,6 +571,7 @@ mason_lspconfig.setup_handlers { on_attach = on_attach, settings = servers[server_name], filetypes = (servers[server_name] or {}).filetypes, + root_dir = (servers[server_name] or {}).root_dir, } end, } diff --git a/lazy-lock.json b/lazy-lock.json index c3c7efdf..52d36384 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -7,17 +7,17 @@ "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, "gitsigns.nvim": { "branch": "main", "commit": "5a9a6ac29a7805c4783cda21b80a1e361964b3f2" }, "indent-blankline.nvim": { "branch": "master", "commit": "8a7b48f5823cc924f815129192288ec2e2b9288f" }, - "lazy.nvim": { "branch": "main", "commit": "9788a19ec0b4036028e78aec702634b4b89d3470" }, + "lazy.nvim": { "branch": "main", "commit": "42fb1e89adb8008a401848e131c5ecb985db52f1" }, "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "09be3766669bfbabbe2863c624749d8da392c916" }, "mason.nvim": { "branch": "main", "commit": "cd7835b15f5a4204fc37e0aa739347472121a54c" }, - "neo-tree.nvim": { "branch": "main", "commit": "63ebe879ad4798b66d29c0b2c8d04942389d438e" }, - "neodev.nvim": { "branch": "main", "commit": "b094a663ccb71733543d8254b988e6bebdbdaca4" }, + "neo-tree.nvim": { "branch": "main", "commit": "0b9a83e6dc47513a81fd9086440d5638683f4f17" }, + "neodev.nvim": { "branch": "main", "commit": "d617d9eb27e73e701e446874c6ea2cb528719260" }, "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" }, "nvim-cmp": { "branch": "main", "commit": "d3a3056204e1a9dbb7c7fe36c114dc43b681768c" }, "nvim-lspconfig": { "branch": "master", "commit": "38da5bbe1eaab2394056109e48c7e195bdb8fdfe" }, - "nvim-treesitter": { "branch": "master", "commit": "f636d58c8d5780e5fe79a8de5691b1712c758b05" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "23f3840b7520e009121b3175f528178136dd9834" }, + "nvim-treesitter": { "branch": "master", "commit": "0179a89656b4ce395a4487c07ae385b8425524ae" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "eb208bfdfcf76efea0424747e23e44641e13aaa6" }, "nvim-web-devicons": { "branch": "master", "commit": "f0267921c845c42685968401bc49aa65e18d3e09" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },