Merge #2906 cleanup root patterns

11 files changed, 27 insertions, 66 deletions

diff --git a/lua/lspconfig/server_configurations/cairo_ls.lua b/lua/lspconfig/server_configurations/cairo_ls.lua
index dfdab914..e79b34ae 100644
--- a/lua/lspconfig/server_configurations/cairo_ls.lua
+++ b/lua/lspconfig/server_configurations/cairo_ls.lua
@@ -8,10 +8,7 @@ return {
     init_options = { hostInfo = 'neovim' },
     cmd = cmd,
     filetypes = { 'cairo' },
-    root_dir = function(fname)
-      return util.root_pattern 'Scarb.toml'(fname)
-        or util.root_pattern('Scarb.toml', 'cairo_project.toml', '.git')(fname)
-    end,
+    root_dir = util.root_pattern('Scarb.toml', 'cairo_project.toml', '.git'),
   },
   docs = {
     description = [[
@@ -27,7 +24,7 @@ require'lspconfig'.cairo_ls.setup{}
 *cairo-language-server is still under active development, some features might not work yet !*
 ]],
     default_config = {
-      root_dir = [[root_pattern("package.json", "tsconfig.json", "jsconfig.json", ".git")]],
+      root_dir = [[root_pattern("Scarb.toml", "cairo_project.toml", ".git")]],
     },
   },
 }
diff --git a/lua/lspconfig/server_configurations/custom_elements_ls.lua b/lua/lspconfig/server_configurations/custom_elements_ls.lua
index cc2b2ca2..e71d7f8b 100644
--- a/lua/lspconfig/server_configurations/custom_elements_ls.lua
+++ b/lua/lspconfig/server_configurations/custom_elements_ls.lua
@@ -4,10 +4,7 @@ return {
   default_config = {
     init_options = { hostInfo = 'neovim' },
     cmd = { 'custom-elements-languageserver', '--stdio' },
-    root_dir = function(fname)
-      return util.root_pattern 'tsconfig.json'(fname)
-        or util.root_pattern('package.json', 'jsconfig.json', '.git')(fname)
-    end,
+    root_dir = util.root_pattern('tsconfig.json', 'package.json', 'jsconfig.json', '.git'),
   },
   docs = {
     description = [[
@@ -36,7 +33,7 @@ Here's an example that disables type checking in JavaScript files.
 ```
 ]],
     default_config = {
-      root_dir = [[root_pattern("package.json", "tsconfig.json", "jsconfig.json", ".git")]],
+      root_dir = [[root_pattern("tsconfig.json", "package.json", "jsconfig.json", ".git")]],
     },
   },
 }
diff --git a/lua/lspconfig/server_configurations/gopls.lua b/lua/lspconfig/server_configurations/gopls.lua
index 1b922f3e..f27033b7 100644
--- a/lua/lspconfig/server_configurations/gopls.lua
+++ b/lua/lspconfig/server_configurations/gopls.lua
@@ -20,7 +20,7 @@ return {
           return clients[#clients].config.root_dir
         end
       end
-      return util.root_pattern 'go.work'(fname) or util.root_pattern('go.mod', '.git')(fname)
+      return util.root_pattern('go.work', 'go.mod', '.git')(fname)
     end,
     single_file_support = true,
   },
diff --git a/lua/lspconfig/server_configurations/gradle_ls.lua b/lua/lspconfig/server_configurations/gradle_ls.lua
index 47091b2d..6af1ee66 100644
--- a/lua/lspconfig/server_configurations/gradle_ls.lua
+++ b/lua/lspconfig/server_configurations/gradle_ls.lua
@@ -7,18 +7,13 @@ end
 
 local root_files = {
   'settings.gradle', -- Gradle (multi-project)
-}
-
-local fallback_root_files = {
   'build.gradle', -- Gradle
 }
 
 return {
   default_config = {
     filetypes = { 'groovy' },
-    root_dir = function(fname)
-      return util.root_pattern(unpack(root_files))(fname) or util.root_pattern(unpack(fallback_root_files))(fname)
-    end,
+    root_dir = util.root_pattern(unpack(root_files)),
     cmd = { bin_name },
     -- gradle-language-server expects init_options.settings to be defined
     init_options = {
@@ -36,7 +31,7 @@ Microsoft's lsp server for gradle files
 If you're setting this up manually, build vscode-gradle using `./gradlew installDist` and point `cmd` to the `gradle-language-server` generated in the build directory
 ]],
     default_config = {
-      root_dir = [[root_pattern("settings.gradle")]],
+      root_dir = [[root_pattern("settings.gradle", "build.gradle")]],
       cmd = { 'gradle-language-server' },
       init_options = {
         settings = {
diff --git a/lua/lspconfig/server_configurations/hls.lua b/lua/lspconfig/server_configurations/hls.lua
index e0d0e702..4390440d 100644
--- a/lua/lspconfig/server_configurations/hls.lua
+++ b/lua/lspconfig/server_configurations/hls.lua
@@ -4,12 +4,7 @@ return {
   default_config = {
     cmd = { 'haskell-language-server-wrapper', '--lsp' },
     filetypes = { 'haskell', 'lhaskell' },
-    root_dir = function(filepath)
-      return (
-        util.root_pattern('hie.yaml', 'stack.yaml', 'cabal.project')(filepath)
-        or util.root_pattern('*.cabal', 'package.yaml')(filepath)
-      )
-    end,
+    root_dir = util.root_pattern('hie.yaml', 'stack.yaml', 'cabal.project', '*.cabal', 'package.yaml'),
     single_file_support = true,
     settings = {
       haskell = {
@@ -51,14 +46,7 @@ require('lspconfig')['hls'].setup{
     ]],
 
     default_config = {
-      root_dir = [[
-function (filepath)
-  return (
-    util.root_pattern('hie.yaml', 'stack.yaml', 'cabal.project')(filepath)
-    or util.root_pattern('*.cabal', 'package.yaml')(filepath)
-  )
-end
-      ]],
+      root_dir = [[root_pattern("hie.yaml", "stack.yaml", "cabal.project", "*.cabal", "package.yaml")]],
     },
   },
 }
diff --git a/lua/lspconfig/server_configurations/kotlin_language_server.lua b/lua/lspconfig/server_configurations/kotlin_language_server.lua
index a955fe63..4f79b2a3 100644
--- a/lua/lspconfig/server_configurations/kotlin_language_server.lua
+++ b/lua/lspconfig/server_configurations/kotlin_language_server.lua
@@ -15,9 +15,6 @@ local root_files = {
   'settings.gradle.kts', -- Gradle (multi-project)
   'build.xml', -- Ant
   'pom.xml', -- Maven
-}
-
-local fallback_root_files = {
   'build.gradle', -- Gradle
   'build.gradle.kts', -- Gradle
 }
@@ -25,9 +22,7 @@ local fallback_root_files = {
 return {
   default_config = {
     filetypes = { 'kotlin' },
-    root_dir = function(fname)
-      return util.root_pattern(unpack(root_files))(fname) or util.root_pattern(unpack(fallback_root_files))(fname)
-    end,
+    root_dir = util.root_pattern(unpack(root_files)),
     cmd = { bin_name },
   },
   docs = {
diff --git a/lua/lspconfig/server_configurations/omnisharp.lua b/lua/lspconfig/server_configurations/omnisharp.lua
index 9b204608..611ea957 100644
--- a/lua/lspconfig/server_configurations/omnisharp.lua
+++ b/lua/lspconfig/server_configurations/omnisharp.lua