@@ -680,13 +680,7 @@ def open_file(self, filepath):
680
680
create_file_action_with_single_server (filepath , lang_server_info , lsp_server )
681
681
elif multi_lang_server :
682
682
# Try to load multi language server when get-multi-lang-server return match one.
683
- multi_lang_server_dir = Path (__file__ ).resolve ().parent / "multiserver"
684
- multi_lang_server_path = multi_lang_server_dir / "{}.json" .format (multi_lang_server )
685
-
686
- user_multi_lang_server_dir = Path (str (get_emacs_vars (["lsp-bridge-user-multiserver-dir" ])[0 ])).expanduser ()
687
- user_multi_lang_server_path = user_multi_lang_server_dir / "{}.json" .format (multi_lang_server )
688
- if user_multi_lang_server_path .exists ():
689
- multi_lang_server_path = user_multi_lang_server_path
683
+ multi_lang_server_path = get_lang_server_path (multi_lang_server , True )
690
684
691
685
with open (multi_lang_server_path , encoding = "utf-8" , errors = "ignore" ) as f :
692
686
multi_lang_server_info = json .load (f )
@@ -1045,12 +1039,15 @@ def load_single_server_info(lang_server):
1045
1039
with open (lang_server_info_path , encoding = "utf-8" , errors = "ignore" ) as f :
1046
1040
return read_lang_server_info (f )
1047
1041
1048
- def get_lang_server_path (server_name ):
1049
- server_dir = Path (__file__ ).resolve ().parent / "langserver"
1042
+ def get_lang_server_path (server_name , is_multi_server = False ):
1043
+ lang_server_dir = "multiserver" if is_multi_server else "langserver"
1044
+ lang_server_dir_var = "lsp-bridge-user-multiserver-dir" if is_multi_server else "lsp-bridge-user-langserver-dir"
1045
+
1046
+ server_dir = Path (__file__ ).resolve ().parent / lang_server_dir
1050
1047
server_path_current = server_dir / "{}_{}.json" .format (server_name , get_os_name ())
1051
1048
server_path_default = server_dir / "{}.json" .format (server_name )
1052
1049
1053
- user_server_dir = Path (str (get_emacs_vars (["lsp-bridge-user-langserver-dir" ])[0 ])).expanduser ()
1050
+ user_server_dir = Path (str (get_emacs_vars ([lang_server_dir_var ])[0 ])).expanduser ()
1054
1051
user_server_path_current = user_server_dir / "{}_{}.json" .format (server_name , get_os_name ())
1055
1052
user_server_path_default = user_server_dir / "{}.json" .format (server_name )
1056
1053
0 commit comments