Ensure tool dir is always on path

microsoft · Aug 2, 2023 · 659cf33 · 659cf33
1 parent 55407dd
commit 659cf33
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/bundled/tool/lsp_server.py b/bundled/tool/lsp_server.py
@@ -28,7 +28,10 @@ def update_sys_path(path_to_add: str, strategy: str) -> None:
 
 
 # Ensure that we can import LSP libraries, and other bundled libraries.
-BUNDLED_LIBS = os.fspath(pathlib.Path(__file__).parent.parent / "libs")
+BUNDLE_DIR = pathlib.Path(__file__).parent.parent
+BUNDLED_LIBS = os.fspath(BUNDLE_DIR / "libs")
+# Always use bundled server files.
+update_sys_path(os.fspath(BUNDLE_DIR / "tool"), "useBundled")
 update_sys_path(
     BUNDLED_LIBS,
     os.getenv("LS_IMPORT_STRATEGY", "useBundled"),