aboutsummaryrefslogtreecommitdiffstats
path: root/lua/lspconfig/server_configurations/cmake.lua
diff options
context:
space:
mode:
authorkylo252 <59826753+kylo252@users.noreply.github.com>2022-06-29 13:21:19 +0200
committerGitHub <noreply@github.com>2022-06-29 04:21:19 -0700
commitfac7accc8163572244d4cc5442964ea188391d9c (patch)
tree61f33a3549a4ec1e16888767165951af56d4c622 /lua/lspconfig/server_configurations/cmake.lua
parentdocs: fix link #1875 (diff)
downloadnvim-lspconfig-fac7accc8163572244d4cc5442964ea188391d9c.tar
nvim-lspconfig-fac7accc8163572244d4cc5442964ea188391d9c.tar.gz
nvim-lspconfig-fac7accc8163572244d4cc5442964ea188391d9c.tar.bz2
nvim-lspconfig-fac7accc8163572244d4cc5442964ea188391d9c.tar.lz
nvim-lspconfig-fac7accc8163572244d4cc5442964ea188391d9c.tar.xz
nvim-lspconfig-fac7accc8163572244d4cc5442964ea188391d9c.tar.zst
nvim-lspconfig-fac7accc8163572244d4cc5442964ea188391d9c.zip
fix(cmake-ls): root pattern should allow nesting (#1976)
it should be fine for a project to have another `CMakeLists.txt`
Diffstat (limited to 'lua/lspconfig/server_configurations/cmake.lua')
-rw-r--r--lua/lspconfig/server_configurations/cmake.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/lua/lspconfig/server_configurations/cmake.lua b/lua/lspconfig/server_configurations/cmake.lua
index d3345357..7f27fea0 100644
--- a/lua/lspconfig/server_configurations/cmake.lua
+++ b/lua/lspconfig/server_configurations/cmake.lua
@@ -1,12 +1,12 @@
local util = require 'lspconfig.util'
-local root_files = { 'CMakeLists.txt', 'cmake' }
+local root_files = { 'CMakePresets.json', 'CTestConfig.cmake', '.git', 'build', 'cmake' }
return {
default_config = {
cmd = { 'cmake-language-server' },
filetypes = { 'cmake' },
root_dir = function(fname)
- return util.root_pattern(unpack(root_files))(fname) or util.find_git_ancestor(fname)
+ return util.root_pattern(unpack(root_files))(fname)
end,
single_file_support = true,
init_options = {
@@ -20,7 +20,7 @@ https://github.com/regen100/cmake-language-server
CMake LSP Implementation
]],
default_config = {
- root_dir = [[root_pattern(".git", "compile_commands.json", "build")]],
+ root_dir = [[root_pattern('CMakePresets.json', 'CTestConfig.cmake', '.git', 'build', 'cmake')]],
},
},
}