update where isWindows is

Author: anthonykim1

src/client/common/configSettings.ts

@@ -36,8 +36,7 @@ import {
 } from './types';
 import { debounceSync } from './utils/decorators';
 import { SystemVariables } from './variables/systemVariables';
-import { getOSType, OSType } from './utils/platform';
-import { isWindows } from './platform/platformService';
+import { getOSType, OSType, isWindows } from './utils/platform';
 import { untildify } from './helpers';
 
 export class PythonSettings implements IPythonSettings {

src/client/common/platform/platformService.ts

@@ -7,7 +7,7 @@ import { injectable } from 'inversify';
 import * as os from 'os';
 import { coerce, SemVer } from 'semver';
 import { getSearchPathEnvVarNames } from '../utils/exec';
-import { Architecture, getArchitecture, getOSType, OSType } from '../utils/platform';
+import { Architecture, getArchitecture, getOSType, isWindows, OSType } from '../utils/platform';
 import { parseSemVerSafe } from '../utils/version';
 import { IPlatformService } from './types';
 
@@ -73,7 +73,3 @@ export class PlatformService implements IPlatformService {
         return getArchitecture() === Architecture.x64;
     }
 }
-
-export function isWindows(): boolean {
-    return getOSType() === OSType.Windows;
-}

src/client/common/terminal/service.ts

@@ -21,7 +21,7 @@ import {
 } from './types';
 import { traceVerbose } from '../../logging';
 import { getConfiguration } from '../vscodeApis/workspaceApis';
-import { isWindows } from '../platform/platformService';
+import { isWindows } from '../utils/platform';
 
 @injectable()
 export class TerminalService implements ITerminalService, Disposable {

src/client/common/utils/platform.ts

@@ -67,3 +67,7 @@ export function getUserHomeDir(): string | undefined {
     }
     return getEnvironmentVariable('HOME') || getEnvironmentVariable('HOMEPATH');
 }
+
+export function isWindows(): boolean {
+    return getOSType() === OSType.Windows;
+}

src/test/common/terminals/service.unit.test.ts

@@ -24,6 +24,7 @@ import { IServiceContainer } from '../../../client/ioc/types';
 import { ITerminalAutoActivation } from '../../../client/terminals/types';
 import { createPythonInterpreter } from '../../utils/interpreters';
 import * as workspaceApis from '../../../client/common/vscodeApis/workspaceApis';
+import * as platform from '../../../client/common/utils/platform';
 
 suite('Terminal Service', () => {
     let service: TerminalService;
@@ -95,7 +96,7 @@ suite('Terminal Service', () => {
         mockServiceContainer.setup((c) => c.get(ITerminalActivator)).returns(() => terminalActivator.object);
         mockServiceContainer.setup((c) => c.get(ITerminalAutoActivation)).returns(() => terminalAutoActivator.object);
         getConfigurationStub = sinon.stub(workspaceApis, 'getConfiguration');
-        isWindowsStub = sinon.stub(platformService.object, 'isWindows');
+        isWindowsStub = sinon.stub(platform, 'isWindows');
         pythonConfig = TypeMoq.Mock.ofType<WorkspaceConfiguration>();
         editorConfig = TypeMoq.Mock.ofType<WorkspaceConfiguration>();
         getConfigurationStub.callsFake((section: string) => {