Refactor: expandTilde dedup, jsonrpc env+ConnectionError, _get_settings_by_path

bundled/tool/lsp_jsonrpc.py

@@ -6,6 +6,7 @@
 import contextlib
 import io
 import json
+import os
 import pathlib
 import subprocess
 import threading
@@ -135,13 +136,23 @@ def stop_all_processes(self):
                 i.send_data({"id": str(uuid.uuid4()), "method": "exit"})
         self._thread_pool.shutdown(wait=False)
 
-    def start_process(self, workspace: str, args: Sequence[str], cwd: str) -> None:
+    def start_process(
+        self,
+        workspace: str,
+        args: Sequence[str],
+        cwd: str,
+        env: Optional[Dict[str, str]] = None,
+    ) -> None:
         """Starts a process and establishes JSON-RPC communication over stdio."""
+        _env = os.environ.copy()
+        if env is not None:
+            _env.update(env)
         proc = subprocess.Popen(
             args,
             cwd=cwd,
             stdout=subprocess.PIPE,
             stdin=subprocess.PIPE,
+            env=_env,
         )
         self._processes[workspace] = proc
         self._rpc[workspace] = create_json_rpc(proc.stdout, proc.stdin)
@@ -212,7 +223,7 @@ def run_over_json_rpc(
     """Uses JSON-RPC to execute a command."""
     rpc: Union[JsonRpc, None] = get_or_start_json_rpc(workspace, interpreter, cwd)
     if not rpc:
-        raise Exception("Failed to run over JSON-RPC.")
+        raise ConnectionError("Failed to run over JSON-RPC.")
 
     msg_id = str(uuid.uuid4())
     msg = {

bundled/tool/lsp_server.py

@@ -697,6 +697,20 @@ def _get_settings_by_document(document: TextDocument | None):
     }
 
 
+def _get_settings_by_path(file_path: pathlib.Path):
+    while file_path != file_path.parent:
+        str_file_path = utils.normalize_path(file_path)
+        for _key, settings in WORKSPACE_SETTINGS.items():
+            if settings["workspaceFS"] == str_file_path:
+                return settings
+        file_path = file_path.parent
+
+    setting_values = list(WORKSPACE_SETTINGS.values())
+    if not setting_values:
+        return {}
+    return setting_values[0]
+
+
 # *****************************************************
 # Internal execution APIs.
 # *****************************************************

src/common/envFile.ts

@@ -8,8 +8,9 @@
 import { traceInfo, traceWarn } from './logging';
 import { getConfiguration } from './vscodeapi';
 
-function expandTilde(value: string): string {
-    const home = process.env.HOME || process.env.USERPROFILE || '';
+export function expandTilde(value: string): string {
+    const home = process.env.HOME || process.env.USERPROFILE;
+    if (!home) return value;
     if (value === '~') {
         return home;
     }

src/common/settings.ts

@@ -6,6 +6,7 @@ import { traceLog, traceWarn } from './logging';
 import { getInterpreterDetails } from './python';
 import { getConfiguration, getWorkspaceFolders } from './vscodeapi';
 import { getInterpreterFromSetting } from './utilities';
+import { expandTilde } from './envFile';
 
 /* eslint-disable @typescript-eslint/naming-convention */
 const DEFAULT_SEVERITY: Record<string, string> = {
@@ -149,13 +150,6 @@ export async function getWorkspaceSettings(
     return workspaceSetting;
 }
 
-function expandTilde(value: string): string {
-    const home = process.env.HOME || process.env.USERPROFILE || '';
-    if (value === '~') return home;
-    if (value.startsWith('~/') || value.startsWith('~\\')) return home + value.slice(1);
-    return value;
-}
-
 function getGlobalValue<T>(config: WorkspaceConfiguration, key: string, defaultValue: T): T {
     const inspect = config.inspect<T>(key);
     return inspect?.globalValue ?? inspect?.defaultValue ?? defaultValue;