Fix settings

25 files changed, 36 insertions, 28 deletions

diff --git a/settings/bash-language-server.vim b/settings/bash-language-server.vim
index a7e28da..b1a7f9a 100644
--- a/settings/bash-language-server.vim
+++ b/settings/bash-language-server.vim
@@ -3,7 +3,8 @@ augroup vimlsp_settings_bash_language_server
   LspRegisterServer {
       \ 'name': 'bash-language-server',
       \ 'cmd': {server_info->lsp_settings#get('bash-language-server', 'cmd', [lsp_settings#exec_path('bash-language-server'), 'start'])},
-      \ 'root_uri':{server_info->lsp_settings#get('bash-language-server', 'root_uri', lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
+      \ 'root_uri':{server_info->lsp_settings#get('bash-language-server', 'root_uri', lsp_settings#root_uri(['.git/']))},
+      \ 'initialization_options': lsp_settings#get('bash-language-server', 'initialization_options', v:null),
       \ 'whitelist': lsp_settings#get('bash-language-server', 'whitelist', ['sh']),
       \ 'blacklist': lsp_settings#get('bash-language-server', 'blacklist', []),
       \ 'config': lsp_settings#get('bash-language-server', 'config', {}),
diff --git a/settings/clangd.vim b/settings/clangd.vim
index 26632a9..a593dfb 100644
--- a/settings/clangd.vim
+++ b/settings/clangd.vim
@@ -3,7 +3,7 @@ augroup vimlsp_settings_clangd
   LspRegisterServer {
       \ 'name': 'clangd',
       \ 'cmd': {server_info->lsp_settings#get('clangd', 'cmd', [lsp_settings#exec_path('clangd')])},
-      \ 'root_uri':{server_info->lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/']))},
+      \ 'root_uri':{server_info->lsp_settings#get('clangd', 'root_uri', lsp_settings#root_uri(['.git/']))},
       \ 'initialization_options': lsp_settings#get('clangd', 'initialization_options', v:null),
       \ 'whitelist': lsp_settings#get('clangd', 'whitelist', ['c', 'cpp', 'objc', 'objcpp']),
       \ 'blacklist': lsp_settings#get('clangd', 'blacklist', []),
diff --git a/settings/clojure-lsp.vim b/settings/clojure-lsp.vim
index 8f727fe..f50e637 100644
--- a/settings/clojure-lsp.vim
+++ b/settings/clojure-lsp.vim
@@ -3,7 +3,7 @@ augroup vimlsp_settings_clojure_lsp
   LspRegisterServer {
       \ 'name': 'clojure-lsp',
       \ 'cmd': {server_info->lsp_settings#get('clojure-lsp', 'cmd', [lsp_settings#exec_path('clojure-lsp')])},
-      \ 'root_uri':{server_info->lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/']))},
+      \ 'root_uri':{server_info->lsp_settings#get('clojure-lsp', 'root_uri', lsp_settings#root_uri(['.git/']))},
       \ 'initialization_options': lsp_settings#get('clojure-lsp', 'initialization_options', v:null),
       \ 'whitelist': lsp_settings#get('clojure-lsp', 'whitelist', ['clojure']),
       \ 'blacklist': lsp_settings#get('clojure-lsp', 'blacklist', []),
diff --git a/settings/css-languageserver.vim b/settings/css-languageserver.vim
index 215e7e9..12707df 100644
--- a/settings/css-languageserver.vim
+++ b/settings/css-languageserver.vim
@@ -3,7 +3,7 @@ augroup vimlsp_settings_css_languageserver
   LspRegisterServer {
       \ 'name': 'css-languageserver',
       \ 'cmd': {server_info->lsp_settings#get('css-languageserver', 'cmd', [lsp_settings#exec_path('css-languageserver'), '--stdio'])},
-      \ 'root_uri':{server_info->lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/']))},
+      \ 'root_uri':{server_info->lsp_settings#get('css-languageserver', 'root_uri', lsp_settings#root_uri(['.git/']))},
       \ 'initialization_options': lsp_settings#get('css-languageserver', 'initialization_options', v:null),
       \ 'whitelist': lsp_settings#get('css-languageserver', 'whitelist', ['css']),
       \ 'blacklist': lsp_settings#get('css-languageserver', 'blacklist', []),
diff --git a/settings/docker-langserver.vim b/settings/docker-langserver.vim
index 7fbf78c..c8e4443 100644
--- a/settings/docker-langserver.vim
+++ b/settings/docker-langserver.vim
@@ -3,7 +3,8 @@ augroup vimlsp_settings_dockerfile_language_server_nodejs
   LspRegisterServer {
       \ 'name': 'docker-langserver',
       \ 'cmd': {server_info->lsp_settings#get('docker-langserver', 'cmd', [lsp_settings#exec_path('docker-langserver'), '--stdio'])},
-      \ 'root_uri':{server_info->lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/']))},
+      \ 'root_uri':{server_info->lsp_settings#get('docker-langserver', 'root_uri', lsp_settings#root_uri(['.git/']))},
+      \ 'initialization_options': lsp_settings#get('docker-langserver', 'initialization_options', v:null),
       \ 'whitelist': lsp_settings#get('docker-langserver', 'whitelist', ['dockerfile']),
       \ 'blacklist': lsp_settings#get('docker-langserver', 'blacklist', []),
       \ 'config': lsp_settings#get('docker-langserver', 'config', {}),
diff --git a/settings/eclipse-jdt-ls.vim b/settings/eclipse-jdt-ls.vim
index 32f9113..5e72f81 100644
--- a/settings/eclipse-jdt-ls.vim
+++ b/settings/eclipse-jdt-ls.vim
@@ -3,7 +3,7 @@ augroup vimlsp_settings_eclipse_jdt_ls
   LspRegisterServer {
       \ 'name': 'eclipse-jdt-ls',
       \ 'cmd': {server_info->lsp_settings#get('eclipse-jdt-ls', 'cmd', [lsp_settings#exec_path('eclipse-jdt-ls')])},
-      \ 'root_uri':{server_info->lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/']))},
+      \ 'root_uri':{server_info->lsp_settings#get('eclipse-jdt-ls', 'root_uri', lsp_settings#root_uri(['.git/', 'pom.xml', 'build.gradle']))},
       \ 'initialization_options': lsp_settings#get('eclipse-jdt-ls', 'initialization_options', v:null),
       \ 'whitelist': lsp_settings#get('eclipse-jdt-ls', 'whitelist', ['java']),
       \ 'blacklist': lsp_settings#get('eclipse-jdt-ls', 'blacklist', []),
diff --git a/settings/elm-language-server.vim b/settings/elm-language-server.vim
index 6dcedb6..63b25d3 100644
--- a/settings/elm-language-server.vim
+++ b/settings/elm-language-server.vim
@@ -3,7 +3,7 @@ augroup vimlsp_settings_elm_language_server
   LspRegisterServer {
       \ 'name': 'elm-language-server',
       \ 'cmd': {server_info->lsp_settings#get('elm-language-server', 'cmd', [lsp_settings#exec_path('elm-language-server')])},
-      \ 'root_uri':{server_info->lsp_settings#get('elm-language-server', 'root_uri', lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/', 'elm.json'])))},
+      \ 'root_uri':{server_info->lsp_settings#get('elm-language-server', 'root_uri', lsp_settings#root_uri(['.git/', 'elm.json']))},
       \ 'initialization_options': lsp_settings#get('elm-language-server', 'initialization_options', {'elmPath': 'elm', 'runtime': 'node', 'elmFormatPath': 'elm-format', 'elmTestPath': 'elm-test'}),
       \ 'whitelist': lsp_settings#get('elm-language-server', 'whitelist', ['elm', 'elm.tsx']),
       \ 'blacklist': lsp_settings#get('elm-language-server', 'blacklist', []),
diff --git a/settings/emmylua-ls.vim b/settings/emmylua-ls.vim
index 92c435c..40af50d 100644
--- a/settings/emmylua-ls.vim
+++ b/settings/emmylua-ls.vim
@@ -3,7 +3,7 @@ augroup vimlsp_settings_emmylua_ls
   LspRegisterServer {
       \ 'name': 'emmylua-ls',
       \ 'cmd': {server_info->lsp_settings#get('emmylua-ls', 'cmd', [lsp_settings#exec_path('emmylua-ls')])},
-      \ 'root_uri':{server_info->lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/']))},
+      \ 'root_uri':{server_info->lsp_settings#get('emmylua-ls', 'root_uri', lsp_settings#root_uri(['.git/']))},
       \ 'initialization_options': lsp_settings#get('emmylua-ls', 'initialization_options', v:null),
       \ 'whitelist': lsp_settings#get('emmylua-ls', 'whitelist', ['lua']),
       \ 'blacklist': lsp_settings#get('emmylua-ls', 'blacklist', []),
diff --git a/settings/fortls.vim b/settings/fortls.vim
index 3aced00..49a8aff 100644
--- a/settings/fortls.vim
+++ b/settings/fortls.vim
@@ -3,6 +3,7 @@ augroup vimlsp_settings_fortls
   LspRegisterServer {
       \ 'name': 'fortls',
       \ 'cmd': {server_info->lsp_settings#get('fortls', 'cmd', [lsp_settings#exec_path('fortls')])},
+      \ 'root_uri':{server_info->lsp_settings#get('fortls', 'root_uri', lsp_settings#root_uri(['.git/']))},
       \ 'initialization_options': lsp_settings#get('fortls', 'initialization_options', v:null),
       \ 'whitelist': lsp_settings#get('fortls', 'whitelist', ['fortran']),
       \ 'blacklist': lsp_settings#get('fortls', 'blacklist', []),
diff --git a/settings/gopls.vim b/settings/gopls.vim
index 86965cc..3a0b93b 100644
--- a/settings/gopls.vim
+++ b/settings/gopls.vim
@@ -3,7 +3,7 @@ augroup vimlsp_settings_gopls
   LspRegisterServer {
       \ 'name': 'gopls',
       \ 'cmd': {server_info->lsp_settings#get('gopls', 'cmd', [lsp_settings#exec_path('gopls')])},
-      \ 'root_uri':{server_info->lsp_settings#get('gopls', 'root_uri', lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/', 'go.mod'])))},
+      \ 'root_uri':{server_info->lsp_settings#get('gopls', 'root_uri', lsp_settings#root_uri(['.git/', 'go.mod']))},
       \ 'initialization_options': lsp_settings#get('gopls', 'initialization_options', {"diagnostics": "true"}),
       \ 'whitelist': lsp_settings#get('gopls', 'whitelist', ['go']),
       \ 'blacklist': lsp_settings#get('gopls', 'blacklist', []),
diff --git a/settings/html-languageserver.vim b/settings/html-languageserver.vim
index 0273ac6..fe741fb 100644
--- a/settings/html-languageserver.vim
+++ b/settings/html-languageserver.vim
@@ -3,7 +3,7 @@ augroup vimlsp_settings_html_languageserver
   LspRegisterServer {
       \ 'name': 'html-languageserver',
       \ 'cmd': {server_info->lsp_settings#get('html-languageserver', 'cmd', [lsp_settings#exec_path('html-languageserver'), '--stdio'])},
-      \ 'root_uri':{server_info->lsp_settings#get('html-langserver', 'root_uri', lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
+      \ 'root_uri':{server_info->lsp_settings#get('html-langserver', 'root_uri', lsp_settings#root_uri(['.git/']))},
       \ 'initialization_options': lsp_settings#get('html-languageserver', 'initialization_options', {'embeddedLanguages': {'css': v:true, 'html': v:true}}),
       \ 'whitelist': lsp_settings#get('html-languageserver', 'whitelist', ['html']),
       \ 'blacklist': lsp_settings#get('html-languageserver', 'blacklist', []),
diff --git a/settings/intelephense.vim b/settings/intelephense.vim
index 4a7c1d5..36f4f07 100644
--- a/settings/intelephense.vim
+++ b/settings/intelephense.vim
@@ -3,7 +3,7 @@ augroup vimlsp_settings_intelephense_server
   LspRegisterServer {
       \ 'name': 'intelephense',
       \ 'cmd': {server_info->lsp_settings#get('intelephense', 'cmd', [lsp_settings#exec_path('intelephense'), '--stdio'])},
-      \ 'root_uri':{server_info->lsp_settings#get('intelephense', 'root_uri', lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
+      \ 'root_uri':{server_info->lsp_settings#get('intelephense', 'root_uri', lsp_settings#root_uri(['.git/']))},
       \ 'initialization_options': lsp_settings#get('intelephense', 'initialization_options', {}),
       \ 'whitelist': lsp_settings#get('intelephense', 'whitelist', ['php']),
       \ 'blacklist': lsp_settings#get('intelephense', 'blacklist', []),
diff --git a/settings/javascript-typescript-langserver.vim b/settings/javascript-typescript-langserver.vim
index 71126da..d277b89 100644
--- a/settings/javascript-typescript-langserver.vim
+++ b/settings/javascript-typescript-langserver.vim
@@ -3,7 +3,7 @@ augroup vimlsp_settings_javascript_typescript_langserver
   LspRegisterServer {
       \ 'name': 'javascript-typescript-langserver',
       \ 'cmd': {server_info->lsp_settings#get('javascript-typescript-langserver', 'cmd', [lsp_settings#exec_path('javascript-typescript-langserver')])},
-      \ 'root_uri':{server_info->lsp_settings#get('javascript-typescript-langserver', 'root_uri', lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
+      \ 'root_uri':{server_info->lsp_settings#get('javascript-typescript-langserver', 'root_uri', lsp_settings#root_uri(['.git/']))},
       \ 'initialization_options': lsp_settings#get('javascript-typescript-langserver', 'initialization_options', {"diagnostics": "true"}),
       \ 'whitelist': lsp_settings#get('javascript-typescript-langserver', 'whitelist', ['javascript']),
       \ 'blacklist': lsp_settings#get('javascript-typescript-langserver', 'blacklist', []),
diff --git a/settings/json-languageserver.vim b/settings/json-languageserver.vim
index 626df64..e1f3375 100644
--- a/settings/json-languageserver.vim
+++ b/settings/json-languageserver.vim
@@ -3,7 +3,7 @@ augroup vimlsp_settings_json_languageserver
   LspRegisterServer {
       \ 'name': 'json-languageserver',
       \ 'cmd': {server_info->lsp_settings#get('json-languageserver', 'cmd', [lsp_settings#exec_path('json-languageserver'), '--stdio'])},
-      \ 'root_uri':{server_info->lsp_settings#get('json-langserver', 'root_uri', lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
+      \ 'root_uri':{server_info->lsp_settings#get('json-languageserver', 'root_uri', lsp_settings#root_uri(['.git/']))},
       \ 'initialization_options': lsp_settings#get('json-languageserver', 'initialization_options', v:null),
       \ 'whitelist': lsp_settings#get('json-languageserver', 'whitelist', ['json']),
       \ 'blacklist': lsp_settings#get('json-languageserver', 'blacklist', []),
diff --git a/settings/kotlin-language-server.vim b/settings/kotlin-language-server.vim
index 479805b..6909653 100644
--- a/settings/kotlin-language-server.vim
+++ b/settings/kotlin-language-server.vim
@@ -3,7 +3,7 @@ augroup vimlsp_settings_kotlin_language_server
   LspRegisterServer {
       \ 'name': 'kotlin-language-server',
       \ 'cmd': {server_info->lsp_settings#get('kotlin-language-server', 'cmd', [lsp_settings#exec_path('kotlin-language-server')])},
-      \ 'root_uri':{server_info->lsp_settings#get('kotlin-language-server', 'root_uri', lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
+      \ 'root_uri':{server_info->lsp_settings#get('kotlin-language-server', 'root_uri', lsp_settings#root_uri(['.git/']))},
       \ 'initialization_options': lsp_settings#get('kotlin-language-server', 'initialization_options', v:null),
       \ 'whitelist': lsp_settings#get('kotlin-language-server', 'whitelist', ['kotlin']),
       \ 'blacklist': lsp_settings#get('kotlin-language-server', 'blacklist', []),
diff --git a/settings/lsp4xml.vim b/settings/lsp4xml.vim
index 79beafe..a24a0d0 100644
--- a/settings/lsp4xml.vim
+++ b/settings/lsp4xml.vim
@@ -3,7 +3,8 @@ augroup vimlsp_settings_lsp4xml
   LspRegisterServer {
       \ 'name': 'lsp4xml',
       \ 'cmd': {server_info->lsp_settings#get('lsp4xml', 'cmd', [lsp_settings#exec_path('lsp4xml')])},
-      \ 'root_uri':{server_info->lsp_settings#get('lsp4xml', 'root_uri', lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
+      \ 'root_uri':{server_info->lsp_settings#get('lsp4xml', 'root_uri', lsp_settings#root_uri(['.git/']))},
+      \ 'initialization_options': lsp_settings#get('lsp4xml', 'initialization_options', v:null),
       \ 'whitelist': lsp_settings#get('lsp4xml', 'whitelist', ['xml']),
       \ 'blacklist': lsp_settings#get('lsp4xml', 'blacklist', []),
       \ 'config': lsp_settings#get('lsp4xml', 'config', {}),
diff --git a/settings/metals.vim b/settings/metals.vim
index 55b6981..70f28d8 100644
--- a/settings/metals.vim
+++ b/settings/metals.vim
@@ -3,7 +3,8 @@ augroup vimlsp_settings_metals
   LspRegisterServer {
       \ 'name': 'metals',
       \ 'cmd': {server_info->lsp_settings#get('metals', 'cmd', [lsp_settings#exec_path('metals')])},
-      \ 'root_uri':{server_info->lsp_settings#get('metals', 'root_uri', lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/', 'build.sbt'])))},
+      \ 'root_uri':{server_info->lsp_settings#get('metals', 'root_uri', lsp_settings#root_uri(['.git/', 'build.sbt']))},
+      \ 'initialization_options': lsp_settings#get('metals', 'initialization_options', v:null),
       \ 'whitelist': lsp_settings#get('metals', 'whitelist', ['scala', 'sbt']),
       \ 'blacklist': lsp_settings#get('metals', 'blacklist', []),
       \ 'config': lsp_settings#get('metals', 'config', {}),
diff --git a/settings/omnisharp-lsp.vim b/settings/omnisharp-lsp.vim
index 1ce7fc4..cfa0a94 100644
--- a/settings/omnisharp-lsp.vim
+++ b/settings/omnisharp-lsp.vim
@@ -2,7 +2,8 @@ augroup vimlsp_settings_omnisharp_lsp
   au!
   LspRegisterServer {
       \ 'name': 'omnisharp-lsp',
-      \ 'root_uri':{server_info->lsp_settings#get('omnisharp-lsp', 'root_uri', lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
+      \ 'cmd': {server_info->lsp_settings#get('omnisharp-lsp', 'cmd', [lsp_settings#exec_path('omnisharp-lsp')])},
+      \ 'root_uri':{server_info->lsp_settings#get('omnisharp-lsp', 'root_uri', lsp_settings#root_uri(['.git/']))},
       \ 'initialization_options': lsp_settings#get('omnisharp-lsp', 'initialization_options', v:null),
       \ 'whitelist': lsp_settings#get('omnisharp-lsp', 'whitelist', ['cs']),
       \ 'blacklist': lsp_settings#get('omnisharp-lsp', 'blacklist', []),
diff --git a/settings/pyls.vim b/settings/pyls.vim
index db7db34..f97a196 100644
--- a/settings/pyls.vim
+++ b/settings/pyls.vim
@@ -3,7 +3,7 @@ augroup vimlsp_settings_pyls
   LspRegisterServer {
       \ 'name': 'pyls',
       \ 'cmd': {server_info->lsp_settings#get('pyls', 'cmd', [lsp_settings#exec_path('pyls')])},
-      \ 'root_uri':{server_info->lsp_settings#get('pyls', 'root_uri', lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
+      \ 'root_uri':{server_info->lsp_settings#get('pyls', 'root_uri', lsp_settings#root_uri(['.git/']))},
       \ 'initialization_options': lsp_settings#get('pyls', 'initialization_options', v:null),
       \ 'whitelist': lsp_settings#get('pyls', 'whitelist', ['python']),
       \ 'blacklist': lsp_settings#get('pyls', 'blacklist', []),
diff --git a/settings/rls.vim b/settings/rls.vim
index 10f2376..45dcbfd 100644
--- a/settings/rls.vim
+++ b/settings/rls.vim
@@ -3,7 +3,7 @@ augroup vimlsp_settings_rls
   LspRegisterServer {
       \ 'name': 'rls',
       \ 'cmd': {server_info->lsp_settings#get('rls', 'cmd', [lsp_settings#exec_path('rls')])},
-      \ 'root_uri':{server_info->lsp_settings#get('rls', 'root_uri', lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
+      \ 'root_uri':{server_info->lsp_settings#get('rls', 'root_uri', lsp_settings#root_uri(['.git/']))},
       \ 'initialization_options': lsp_settings#get('rls', 'initialization_options', v:null),
       \ 'whitelist': lsp_settings#get('rls', 'whitelist', ['rust']),
       \ 'blacklist': lsp_settings#get('rls', 'blacklist', []),
diff --git a/settings/solargraph.vim b/settings/solargraph.vim
index 796ee0a..8081a2c 100644
--- a/settings/solargraph.vim
+++ b/settings/solargraph.vim
@@ -3,7 +3,7 @@ augroup vimlsp_settings_solargraph
   LspRegisterServer {
       \ 'name': 'solargraph',
       \ 'cmd': {server_info->lsp_settings#get('solargraph', 'cmd', [lsp_settings#exec_path('solargraph'), 'stdio'])},
-      \ 'root_uri':{server_info->lsp_settings#get('solargraph', 'root_uri', lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
+      \ 'root_uri':{server_info->lsp_settings#get('solargraph', 'root_uri', lsp_settings#root_uri(['.git/']))},
       \ 'initialization_options': lsp_settings#get('solargraph', 'initialization_options', {"diagnostics": "true"}),
       \ 'whitelist': lsp_settings#get('solargraph', 'whitelist', ['ruby']),
       \ 'blacklist': lsp_settings#get('solargraph', 'blacklist', []),
diff --git a/settings/terraform-lsp.vim b/settings/terraform-lsp.vim
index 1df13cb..113597f 100644
--- a/settings/terraform-lsp.vim
+++ b/settings/terraform-lsp.vim
@@ -3,7 +3,8 @@ augroup vimlsp_settings_terraform_lsp
   LspRegisterServer {
       \ 'name': 'terraform-lsp',
       \ 'cmd': {server_info->lsp_settings#get('terraform-lsp', 'cmd', [lsp_settings#exec_path('terraform-lsp')])},
-      \ 'root_uri':{server_info->lsp_settings#get('terraform-lsp', 'root_uri', lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
+      \ 'root_uri':{server_info->lsp_settings#get('terraform-lsp', 'root_uri', lsp_settings#root_uri(['.git/']))},
+      \ 'initialization_options': lsp_settings#get('terraform-lsp', 'initialization_options', v:null),
       \ 'whitelist': lsp_settings#get('terraform-lsp', 'whitelist', ['terraform']),
       \ 'blacklist': lsp_settings#get('terraform-lsp', 'blacklist', []),
       \ 'config': lsp_settings#get('terraform-lsp', 'config', {}),
diff --git a/settings/typescript-language-server.vim b/settings/typescript-language-server.vim
index 400452a..1147976 100644
--- a/settings/typescript-language-server.vim
+++ b/settings/typescript-language-server.vim
@@ -3,7 +3,7 @@ augroup vimlsp_settings_typescript_language_server
   LspRegisterServer {
       \ 'name': 'typescript-language-server',
       \ 'cmd': {server_info->lsp_settings#get('typescript-language-server', 'cmd', [lsp_settings#exec_path('typescript-language-server'), '--stdio'])},
-      \ 'root_uri':{server_info->lsp_settings#get('typescript-language-server', 'root_uri', lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
+      \ 'root_uri':{server_info->lsp_settings#get('typescript-language-server', 'root_uri', lsp_settings#root_uri(['.git/', 'package.json']))},
       \ 'initialization_options': lsp_settings#get('typescript-language-server', 'initialization_options', {"diagnostics": "true"}),
       \ 'whitelist': lsp_settings#get('typescript-language-server', 'whitelist', ['typescript', 'typescript.tsx']),
       \ 'blacklist': lsp_settings#get('typescript-language-server', 'blacklist', []),
diff --git a/settings/vim-language-server.vim b/settings/vim-language-server.vim
index f3497b9..d3c7c51 100644
--- a/settings/vim-language-server.vim
+++ b/settings/vim-language-server.vim
@@ -3,11 +3,11 @@ augroup vimlsp_settings_vim_language_server
   LspRegisterServer {
       \ 'name': 'vim-language-server',
       \ 'cmd': {server_info->lsp_settings#get('vim-language-server', 'cmd', [lsp_settings#exec_path('vim-language-server'), '--stdio'])},
-      \ 'root_uri':{server_info->lsp_settings#get('vim-language-server', 'root_uri', lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/', '.vim/', 'vimfiles/'])))},
+      \ 'root_uri':{server_info->lsp_settings#get('vim-language-server', 'root_uri', lsp_settings#root_uri(['.git/', '.vim/', 'vimfiles/']))},
       \ 'initialization_options': { 'vimruntime': $VIMRUNTIME, 'runtimepath': &rtp },
-      \ 'whitelist': ['vim'],
-      \ 'blacklist': lsp_settings#get('bash-language-server', 'blacklist', []),
-      \ 'config': lsp_settings#get('bash-language-server', 'config', {}),
-      \ 'workspace_config': lsp_settings#get('bash-language-server', 'workspace_config', {}),
+      \ 'whitelist': lsp_settings#get('vim-language-server', 'whitelist', ['vim']), 
+      \ 'blacklist': lsp_settings#get('vimbash-language-server', 'blacklist', []),
+      \ 'config': lsp_settings#get('vim-language-server', 'config', {}),
+      \ 'workspace_config': lsp_settings#get('vim-language-server', 'workspace_config', {}),
       \ }
 augroup END
diff --git a/settings/yaml-language-server.vim b/settings/yaml-language-server.vim
index 83e36e7..7fffc67 100644
--- a/settings/yaml-language-server.vim
+++ b/settings/yaml-language-server.vim
@@ -3,7 +3,8 @@ augroup vimlsp_settings_yaml_language_server
   LspRegisterServer {
       \ 'name': 'yaml-language-server',
       \ 'cmd': {server_info->lsp_settings#get('yaml-language-server', 'cmd', [lsp_settings#exec_path('yaml-language-server'), '--stdio'])},
-      \ 'root_uri':{server_info->lsp_settings#get('yaml-language-server', 'root_uri', lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
+      \ 'root_uri':{server_info->lsp_settings#get('yaml-language-server', 'root_uri', lsp_settings#root_uri(['.git/']))},
+      \ 'initialization_options': lsp_settings#get('yaml-language-server', 'initialization_options', v:null),
       \ 'whitelist': lsp_settings#get('yaml-language-server', 'whitelist', ['yaml']),
       \ 'blacklist': lsp_settings#get('yaml-language-server', 'blacklist', []),
       \ 'config': lsp_settings#get('yaml-language-server', 'config', {}),