From d2f5a63ff5db6e1a8f9124d4cc8149c97129dd9a Mon Sep 17 00:00:00 2001 From: David Briscoe Date: Wed, 22 Jan 2020 23:33:46 -0800 Subject: Support svn, hg, bzr as root markers Move common root marker list to plugin/lsp_settings.vim. Update all uses to merge the two lists. Test: :edit lsp-settings/data/catalog.json :Verbose ec lsp_settings#root_uri(extend(['catalog.json'], g:lsp_settings_root_markers)) file:///C:/david/settings/daveconfig/multi/vim/bundle/lsp-settings/data :Verbose ec lsp_settings#root_uri(g:lsp_settings_root_markers) file:///C:/david/settings/daveconfig :Verbose ec lsp_settings#root_uri(extend(['rebar.config'], g:lsp_settings_root_markers)) file:///C:/david/settings/daveconfig Install rls and edit a rust file. --- settings/elm-language-server.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'settings/elm-language-server.vim') diff --git a/settings/elm-language-server.vim b/settings/elm-language-server.vim index 63b25d3..03e8c1d 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_settings#root_uri(['.git/', 'elm.json']))}, + \ 'root_uri':{server_info->lsp_settings#get('elm-language-server', 'root_uri', lsp_settings#root_uri(extend(['elm.json'], g:lsp_settings_root_markers)))}, \ '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', []), -- cgit v1.2.3-54-g00ecf