help for test runs

Author: eleanorjboyd

src/features/settings/settingHelpers.ts

@@ -10,7 +10,7 @@ import {
 import { PythonProject } from '../../api';
 import { DEFAULT_ENV_MANAGER_ID, DEFAULT_PACKAGE_MANAGER_ID } from '../../common/constants';
 import { traceError, traceInfo, traceWarn } from '../../common/logging';
-import { getConfiguration, getWorkspaceFile, getWorkspaceFolders } from '../../common/workspace.apis';
+import * as workspaceApis from '../../common/workspace.apis';
 import { PythonProjectManager, PythonProjectSettings } from '../../internal.api';
 
 function getSettings(
@@ -42,7 +42,7 @@ export function isDefaultEnvManagerBroken(): boolean {
 }
 
 export function getDefaultEnvManagerSetting(wm: PythonProjectManager, scope?: Uri): string {
-    const config = getConfiguration('python-envs', scope);
+    const config = workspaceApis.getConfiguration('python-envs', scope);
     const settings = getSettings(wm, config, scope);
     if (settings && settings.envManager.length > 0) {
         return settings.envManager;
@@ -69,7 +69,7 @@ export function getDefaultPkgManagerSetting(
     scope?: ConfigurationScope | null,
     defaultId?: string,
 ): string {
-    const config = getConfiguration('python-envs', scope);
+    const config = workspaceApis.getConfiguration('python-envs', scope);
 
     const settings = getSettings(wm, config, scope);
     if (settings && settings.packageManager.length > 0) {
@@ -123,11 +123,11 @@ export async function setAllManagerSettings(edits: EditAllManagerSettings[]): Pr
         }
     });
 
-    const workspaceFile = getWorkspaceFile();
+    const workspaceFile = workspaceApis.getWorkspaceFile();
     const promises: Thenable<void>[] = [];
 
     workspaces.forEach((es, w) => {
-        const config = getConfiguration('python-envs', w);
+        const config = workspaceApis.getConfiguration('python-envs', w);
         const overrides = config.get<PythonProjectSettings[]>('pythonProjects', []);
         const projectsInspect = config.inspect<PythonProjectSettings[]>('pythonProjects');
         const existingProjectsSetting =
@@ -192,7 +192,7 @@ export async function setAllManagerSettings(edits: EditAllManagerSettings[]): Pr
         }
     });
 
-    const config = getConfiguration('python-envs', undefined);
+    const config = workspaceApis.getConfiguration('python-envs', undefined);
     edits
         .filter((e) => !e.project)
         .forEach((e) => {
@@ -253,7 +253,7 @@ export async function setEnvironmentManager(edits: EditEnvManagerSettings[]): Pr
     const promises: Thenable<void>[] = [];
 
     workspaces.forEach((es, w) => {
-        const config = getConfiguration('python-envs', w.uri);
+        const config = workspaceApis.getConfiguration('python-envs', w.uri);
         const overrides = config.get<PythonProjectSettings[]>('pythonProjects', []);
         const projectsInspect = config.inspect<PythonProjectSettings[]>('pythonProjects');
         const existingProjectsSetting = projectsInspect?.workspaceValue ?? undefined;
@@ -285,7 +285,7 @@ export async function setEnvironmentManager(edits: EditEnvManagerSettings[]): Pr
         }
     });
 
-    const config = getConfiguration('python-envs', undefined);
+    const config = workspaceApis.getConfiguration('python-envs', undefined);
     edits
         .filter((e) => !e.project)
         .forEach((e) => {
@@ -337,7 +337,7 @@ export async function setPackageManager(edits: EditPackageManagerSettings[]): Pr
     const promises: Thenable<void>[] = [];
 
     workspaces.forEach((es, w) => {
-        const config = getConfiguration('python-envs', w.uri);
+        const config = workspaceApis.getConfiguration('python-envs', w.uri);
         const overrides = config.get<PythonProjectSettings[]>('pythonProjects', []);
         const projectsInspect = config.inspect<PythonProjectSettings[]>('pythonProjects');
         const existingProjectsSetting = projectsInspect?.workspaceValue ?? undefined;
@@ -374,7 +374,7 @@ export async function setPackageManager(edits: EditPackageManagerSettings[]): Pr
         }
     });
 
-    const config = getConfiguration('python-envs', undefined);
+    const config = workspaceApis.getConfiguration('python-envs', undefined);
     edits
         .filter((e) => !e.project)
         .forEach((e) => {
@@ -403,7 +403,7 @@ export interface EditProjectSettings {
 export async function addPythonProjectSetting(edits: EditProjectSettings[]): Promise<void> {
     const noWorkspace: EditProjectSettings[] = [];
     const workspaces = new Map<WorkspaceFolder, EditProjectSettings[]>();
-    const globalConfig = getConfiguration('python-envs', undefined);
+    const globalConfig = workspaceApis.getConfiguration('python-envs', undefined);
     const envManager = globalConfig.get<string>('defaultEnvManager', DEFAULT_ENV_MANAGER_ID);
     const pkgManager = globalConfig.get<string>('defaultPackageManager', DEFAULT_PACKAGE_MANAGER_ID);
 
@@ -420,11 +420,11 @@ export async function addPythonProjectSetting(edits: EditProjectSettings[]): Pro
         traceError(`Unable to find workspace for ${e.project.uri.fsPath}`);
     });
 
-    const isMultiroot = (getWorkspaceFolders() ?? []).length > 1;
+    const isMultiroot = (workspaceApis.getWorkspaceFolders() ?? []).length > 1;
 
     const promises: Thenable<void>[] = [];
     workspaces.forEach((es, w) => {
-        const config = getConfiguration('python-envs', w.uri);
+        const config = workspaceApis.getConfiguration('python-envs', w.uri);
         const overrides = config.get<PythonProjectSettings[]>('pythonProjects', []);
         es.forEach((e) => {
             if (isMultiroot) {
@@ -473,7 +473,7 @@ export async function removePythonProjectSetting(edits: EditProjectSettings[]):
 
     const promises: Thenable<void>[] = [];
     workspaces.forEach((es, w) => {
-        const config = getConfiguration('python-envs', w.uri);
+        const config = workspaceApis.getConfiguration('python-envs', w.uri);
         const overrides = config.get<PythonProjectSettings[]>('pythonProjects', []);
         es.forEach((e) => {
             const pwPath = path.normalize(e.project.uri.fsPath);
@@ -497,7 +497,7 @@ export async function removePythonProjectSetting(edits: EditProjectSettings[]):
  * @param newUri The new URI of the project folder after rename/move
  */
 export async function updatePythonProjectSettingPath(oldUri: Uri, newUri: Uri): Promise<void> {
-    const workspaceFolders = getWorkspaceFolders() ?? [];
+    const workspaceFolders = workspaceApis.getWorkspaceFolders() ?? [];
 
     // Find the workspace folder that contains the old path
     let targetWorkspace: WorkspaceFolder | undefined;
@@ -514,7 +514,7 @@ export async function updatePythonProjectSettingPath(oldUri: Uri, newUri: Uri):
         return;
     }
 
-    const config = getConfiguration('python-envs', targetWorkspace.uri);
+    const config = workspaceApis.getConfiguration('python-envs', targetWorkspace.uri);
     const overrides = config.get<PythonProjectSettings[]>('pythonProjects', []);
     const oldNormalizedPath = path.normalize(oldUri.fsPath);
 
@@ -536,7 +536,7 @@ export async function updatePythonProjectSettingPath(oldUri: Uri, newUri: Uri):
  * @returns The user-configured value or undefined if not set by user
  */
 export function getSettingWindowScope<T>(section: string, key: string): T | undefined {
-    const config = getConfiguration(section);
+    const config = workspaceApis.getConfiguration(section);
     const inspect = config.inspect<T>(key);
     if (!inspect) {
         return undefined;
@@ -564,7 +564,7 @@ export function getSettingWindowScope<T>(section: string, key: string): T | unde
  * @returns The user-configured value or undefined if not set by user
  */
 export function getSettingWorkspaceScope<T>(section: string, key: string, scope?: Uri): T | undefined {
-    const config = getConfiguration(section, scope);
+    const config = workspaceApis.getConfiguration(section, scope);
     const inspect = config.inspect<T>(key);
     if (!inspect) {
         return undefined;
@@ -590,7 +590,7 @@ export function getSettingWorkspaceScope<T>(section: string, key: string, scope?
  * @returns The user-configured value or undefined if not set by user
  */
 export function getSettingUserScope<T>(section: string, key: string): T | undefined {
-    const config = getConfiguration(section);
+    const config = workspaceApis.getConfiguration(section);
     const inspect = config.inspect<T>(key);
     if (!inspect) {
         return undefined;