CHANGE PATH TO ISWINDOWS()

Author: anthonykim1

src/client/common/pipes/namedPipes.ts

@@ -10,7 +10,7 @@ import * as path from 'path';
 import * as rpc from 'vscode-jsonrpc/node';
 import { CancellationError, CancellationToken, Disposable } from 'vscode';
 import { traceVerbose } from '../../logging';
-import { isWindows } from '../platform/platformService';
+import { isWindows } from '../utils/platform';
 import { createDeferred } from '../utils/async';
 
 const { XDG_RUNTIME_DIR } = process.env;

src/client/common/serviceRegistry.ts

@@ -88,7 +88,7 @@ import { Random } from './utils/random';
 import { ContextKeyManager } from './application/contextKeyManager';
 import { CreatePythonFileCommandHandler } from './application/commands/createPythonFile';
 import { RequireJupyterPrompt } from '../jupyter/requireJupyterPrompt';
-import { isWindows } from './platform/platformService';
+import { isWindows } from './utils/platform';
 import { PixiActivationCommandProvider } from './terminal/environmentActivationProviders/pixiActivationProvider';
 
 export function registerTypes(serviceManager: IServiceManager): void {

src/client/pythonEnvironments/base/locators/common/nativePythonFinder.ts

@@ -7,15 +7,14 @@ import * as path from 'path';
 import * as rpc from 'vscode-jsonrpc/node';
 import { PassThrough } from 'stream';
 import * as fs from '../../../../common/platform/fs-paths';
-import { isWindows } from '../../../../common/platform/platformService';
+import { isWindows, getUserHomeDir } from '../../../../common/utils/platform';
 import { EXTENSION_ROOT_DIR } from '../../../../constants';
 import { createDeferred, createDeferredFrom } from '../../../../common/utils/async';
 import { DisposableBase, DisposableStore } from '../../../../common/utils/resourceLifecycle';
 import { noop } from '../../../../common/utils/misc';
 import { getConfiguration, getWorkspaceFolderPaths, isTrusted } from '../../../../common/vscodeApis/workspaceApis';
 import { CONDAPATH_SETTING_KEY } from '../../../common/environmentManagers/conda';
 import { VENVFOLDERS_SETTING_KEY, VENVPATH_SETTING_KEY } from '../lowLevel/customVirtualEnvLocator';
-import { getUserHomeDir } from '../../../../common/utils/platform';
 import { createLogOutputChannel } from '../../../../common/vscodeApis/windowApis';
 import { sendNativeTelemetry, NativePythonTelemetry } from './nativePythonTelemetry';
 import { NativePythonEnvironmentKind } from './nativePythonUtils';

src/client/pythonEnvironments/base/locators/common/pythonWatcher.ts

@@ -3,7 +3,7 @@
 
 import { Disposable, Event, EventEmitter, GlobPattern, RelativePattern, Uri, WorkspaceFolder } from 'vscode';
 import { createFileSystemWatcher, getWorkspaceFolder } from '../../../../common/vscodeApis/workspaceApis';
-import { isWindows } from '../../../../common/platform/platformService';
+import { isWindows } from '../../../../common/utils/platform';
 import { arePathsSame } from '../../../common/externalDependencies';
 import { FileChangeType } from '../../../../common/platform/fileSystemWatcher';
 

src/client/pythonEnvironments/common/environmentManagers/pixi.ts

@@ -6,12 +6,11 @@
 import * as path from 'path';
 import { readJSON } from 'fs-extra';
 import which from 'which';
-import { getUserHomeDir } from '../../../common/utils/platform';
+import { getUserHomeDir, isWindows } from '../../../common/utils/platform';
 import { exec, getPythonSetting, onDidChangePythonSetting, pathExists } from '../externalDependencies';
 import { cache } from '../../../common/utils/decorators';
 import { traceVerbose, traceWarn } from '../../../logging';
 import { OUTPUT_MARKER_SCRIPT } from '../../../common/process/internal/scripts';
-import { isWindows } from '../../../common/platform/platformService';
 import { IDisposableRegistry } from '../../../common/types';
 import { getWorkspaceFolderPaths } from '../../../common/vscodeApis/workspaceApis';
 import { isTestExecution } from '../../../common/constants';

src/client/pythonEnvironments/creation/common/commonUtils.ts

@@ -7,7 +7,7 @@ import { Commands } from '../../../common/constants';
 import { Common } from '../../../common/utils/localize';
 import { executeCommand } from '../../../common/vscodeApis/commandApis';
 import { showErrorMessage } from '../../../common/vscodeApis/windowApis';
-import { isWindows } from '../../../common/platform/platformService';
+import { isWindows } from '../../../common/utils/platform';
 
 export async function showErrorMessageWithLogs(message: string): Promise<void> {
     const result = await showErrorMessage(message, Common.openOutputPanel, Common.selectPythonInterpreter);

src/client/pythonEnvironments/creation/provider/venvUtils.ts

@@ -26,7 +26,7 @@ import {
 import { findFiles } from '../../../common/vscodeApis/workspaceApis';
 import { traceError, traceVerbose } from '../../../logging';
 import { Commands } from '../../../common/constants';
-import { isWindows } from '../../../common/platform/platformService';
+import { isWindows } from '../../../common/utils/platform';
 import { getVenvPath, hasVenv } from '../common/commonUtils';
 import { deleteEnvironmentNonWindows, deleteEnvironmentWindows } from './venvDeleteUtils';
 

src/test/common/configSettings.test.ts

@@ -4,7 +4,7 @@ import * as vscode from 'vscode';
 import { SystemVariables } from '../../client/common/variables/systemVariables';
 import { getExtensionSettings } from '../extensionSettings';
 import { initialize } from './../initialize';
-import { isWindows } from '../../client/common/platform/platformService';
+import { isWindows } from '../../client/common/utils/platform';
 
 const workspaceRoot = path.join(__dirname, '..', '..', '..', 'src', 'test');
 

src/test/serviceRegistry.ts

@@ -7,7 +7,8 @@ import * as TypeMoq from 'typemoq';
 import { Disposable, Memento } from 'vscode';
 import { FileSystem } from '../client/common/platform/fileSystem';
 import { PathUtils } from '../client/common/platform/pathUtils';
-import { PlatformService, isWindows } from '../client/common/platform/platformService';
+import { PlatformService } from '../client/common/platform/platformService';
+import { isWindows } from '../client/common/utils/platform';
 import { RegistryImplementation } from '../client/common/platform/registry';
 import { registerTypes as platformRegisterTypes } from '../client/common/platform/serviceRegistry';
 import { IFileSystem, IPlatformService, IRegistry } from '../client/common/platform/types';