use sys_path method

Author: mrclary

Diff for: pylsp/workspace.py

@@ -534,11 +534,8 @@ def jedi_script(self, position=None, use_document_path=False):
 
         environment = self.get_enviroment(environment_path, env_vars=env_vars)
 
-        sys_path = list(self._extra_sys_path) + environment.get_sys_path()
-        if prioritize:
-            sys_path += extra_paths + sys_path
-        else:
-            sys_path += sys_path + extra_paths
+        sys_path = self.sys_path(environment_path, env_vars, prioritize, extra_paths)
+
         project_path = self._workspace.root_path
 
         # Extend sys_path with document's path if requested
@@ -573,14 +570,18 @@ def get_enviroment(self, environment_path=None, env_vars=None):
 
         return environment
 
-    def sys_path(self, environment_path=None, env_vars=None):
-        # TODO: when safe to break API, remove this method.
+    def sys_path(self, environment_path=None, env_vars=None, prioritize=False, extra_paths=[]):
         # Copy our extra sys path
         path = list(self._extra_sys_path)
         environment = self.get_enviroment(
             environment_path=environment_path, env_vars=env_vars
         )
         path.extend(environment.get_sys_path())
+        if prioritize:
+            path += extra_paths + path
+        else:
+            path += path + extra_paths
+
         return path
 
 

Diff for: test/test_workspace.py

@@ -70,7 +70,7 @@ def test_non_root_project(pylsp, metafiles):
     test_uri = uris.from_fs_path(os.path.join(project_root, "hello/test.py"))
     pylsp.workspace.put_document(test_uri, "assert True")
     test_doc = pylsp.workspace.get_document(test_uri)
-    assert project_root in test_doc.get_enviroment().get_sys_path()
+    assert project_root in test_doc.sys_path()
 
 
 def test_root_project_with_no_setup_py(pylsp):
@@ -79,7 +79,7 @@ def test_root_project_with_no_setup_py(pylsp):
     test_uri = uris.from_fs_path(os.path.join(workspace_root, "hello/test.py"))
     pylsp.workspace.put_document(test_uri, "assert True")
     test_doc = pylsp.workspace.get_document(test_uri)
-    assert workspace_root in test_doc.get_enviroment().get_sys_path()
+    assert workspace_root in test_doc.sys_path()
 
 
 def test_multiple_workspaces_from_initialize(pylsp_w_workspace_folders):