chore: refactor move some utility functions to common location

Author: karthiknadig

src/common/pickers/environments.ts

@@ -3,10 +3,10 @@ import { IconPath, PythonEnvironment, PythonProject } from '../../api';
 import { InternalEnvironmentManager } from '../../internal.api';
 import { Common, Interpreter, Pickers } from '../localize';
 import { showQuickPickWithButtons, showQuickPick, showOpenDialog, withProgress } from '../window.apis';
-import { isWindows } from '../../managers/common/utils';
 import { traceError } from '../logging';
 import { pickEnvironmentManager } from './managers';
 import { handlePythonPath } from '../utils/pythonPath';
+import { isWindows } from '../utils/platformUtils';
 
 type QuickPickIcon =
     | Uri

src/common/utils/pathUtils.ts

@@ -1,4 +1,5 @@
 import * as path from 'path';
+import * as os from 'os';
 
 export function areSamePaths(a: string, b: string): boolean {
     return path.resolve(a) === path.resolve(b);
@@ -8,3 +9,11 @@ export function isParentPath(parent: string, child: string): boolean {
     const relative = path.relative(path.resolve(parent), path.resolve(child));
     return !!relative && !relative.startsWith('..') && !path.isAbsolute(relative);
 }
+
+export function untildify(path: string): string {
+    return path.replace(/^~($|\/|\\)/, `${os.homedir()}$1`);
+}
+
+export function getUserHomeDir(): string {
+    return os.homedir();
+}

src/common/utils/platformUtils.ts

@@ -0,0 +1,3 @@
+export function isWindows(): boolean {
+    return process.platform === 'win32';
+}

src/features/common/shellDetector.ts

@@ -1,8 +1,8 @@
 import * as os from 'os';
 import { Terminal } from 'vscode';
-import { isWindows } from '../../managers/common/utils';
 import { vscodeShell } from '../../common/vscodeEnv.apis';
 import { getConfiguration } from '../../common/workspace.apis';
+import { isWindows } from '../../common/utils/platformUtils';
 
 /*
 When identifying the shell use the following algorithm:

src/managers/builtin/venvUtils.ts

@@ -18,7 +18,7 @@ import {
     NativePythonFinder,
 } from '../common/nativePythonFinder';
 import { getWorkspacePersistentState } from '../../common/persistentState';
-import { isWindows, shortVersion, sortEnvironments } from '../common/utils';
+import { shortVersion, sortEnvironments } from '../common/utils';
 import { getConfiguration } from '../../common/workspace.apis';
 import { pickEnvironmentFrom } from '../../common/pickers/environments';
 import {
@@ -32,6 +32,7 @@ import { showErrorMessage } from '../../common/errors/utils';
 import { Common, VenvManagerStrings } from '../../common/localize';
 import { isUvInstalled, runUV, runPython } from './helpers';
 import { getWorkspacePackagesToInstall } from './pipUtils';
+import { isWindows } from '../../common/utils/platformUtils';
 
 export const VENV_WORKSPACE_KEY = `${ENVS_EXTENSION_ID}:venv:WORKSPACE_SELECTED`;
 export const VENV_GLOBAL_KEY = `${ENVS_EXTENSION_ID}:venv:GLOBAL_SELECTED`;

src/managers/common/nativePythonFinder.ts

@@ -4,13 +4,15 @@ import * as rpc from 'vscode-jsonrpc/node';
 import * as ch from 'child_process';
 import { ENVS_EXTENSION_ID, PYTHON_EXTENSION_ID } from '../../common/constants';
 import { getExtension } from '../../common/extension.apis';
-import { getUserHomeDir, isWindows, noop, untildify } from './utils';
+import { noop } from './utils';
 import { Disposable, ExtensionContext, LogOutputChannel, Uri } from 'vscode';
 import { PassThrough } from 'stream';
 import { PythonProjectApi } from '../../api';
 import { getConfiguration } from '../../common/workspace.apis';
 import { createRunningWorkerPool, WorkerPool } from '../../common/utils/workerPool';
 import { traceVerbose } from '../../common/logging';
+import { isWindows } from '../../common/utils/platformUtils';
+import { getUserHomeDir, untildify } from '../../common/utils/pathUtils';
 
 async function getNativePythonToolsPath(): Promise<string> {
     const envsExt = getExtension(ENVS_EXTENSION_ID);

src/managers/common/utils.ts

@@ -1,20 +1,7 @@
-import * as os from 'os';
 import { Package, PythonEnvironment } from '../../api';
 import { showQuickPick } from '../../common/window.apis';
 import { PackageManagement } from '../../common/localize';
 
-export function isWindows(): boolean {
-    return process.platform === 'win32';
-}
-
-export function untildify(path: string): string {
-    return path.replace(/^~($|\/|\\)/, `${os.homedir()}$1`);
-}
-
-export function getUserHomeDir(): string {
-    return os.homedir();
-}
-
 export function noop() {
     // do nothing
 }

src/managers/conda/condaUtils.ts

@@ -34,14 +34,16 @@ import {
 import { getConfiguration } from '../../common/workspace.apis';
 import { getGlobalPersistentState, getWorkspacePersistentState } from '../../common/persistentState';
 import which from 'which';
-import { isWindows, shortVersion, sortEnvironments, untildify } from '../common/utils';
+import { shortVersion, sortEnvironments } from '../common/utils';
 import { pickProject } from '../../common/pickers/projects';
 import { CondaStrings, PackageManagement, Pickers } from '../../common/localize';
 import { showErrorMessage } from '../../common/errors/utils';
 import { showInputBox, showQuickPick, showQuickPickWithButtons, withProgress } from '../../common/window.apis';
 import { Installable, selectFromCommonPackagesToInstall } from '../common/pickers';
 import { quoteArgs } from '../../features/execution/execUtils';
 import { traceInfo } from '../../common/logging';
+import { untildify } from '../../common/utils/pathUtils';
+import { isWindows } from '../../common/utils/platformUtils';
 
 export const CONDA_PATH_KEY = `${ENVS_EXTENSION_ID}:conda:CONDA_PATH`;
 export const CONDA_PREFIXES_KEY = `${ENVS_EXTENSION_ID}:conda:CONDA_PREFIXES`;