Skip to content

Commit a91bc95

Browse files
committed
move isWsl to separate file outside of platform
1 parent 4885587 commit a91bc95

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

src/client/common/terminal/service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ import {
2121
} from './types';
2222
import { traceVerbose } from '../../logging';
2323
import { getConfiguration } from '../vscodeApis/workspaceApis';
24-
import { isWindows, isWsl } from '../utils/platform';
24+
import { isWindows } from '../utils/platform';
25+
import { isWsl } from '../utils/envApis';
2526

2627
@injectable()
2728
export class TerminalService implements ITerminalService, Disposable {

src/client/common/utils/envApis.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License.
3+
4+
'use strict';
5+
6+
import { env } from 'vscode';
7+
8+
export function isWsl(): boolean {
9+
return env.remoteName === 'wsl';
10+
}

src/client/common/utils/platform.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
'use strict';
55

6-
import { env } from 'vscode';
76
import { EnvironmentVariables } from '../variables/types';
87
export enum Architecture {
98
Unknown = 1,
@@ -30,10 +29,6 @@ export function getOSType(platform: string = process.platform): OSType {
3029
}
3130
}
3231

33-
export function isWsl(): boolean {
34-
return env.remoteName === 'wsl';
35-
}
36-
3732
const architectures: Record<string, Architecture> = {
3833
x86: Architecture.x86, // 32-bit
3934
x64: Architecture.x64, // 64-bit

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import { ITerminalAutoActivation } from '../../../client/terminals/types';
2525
import { createPythonInterpreter } from '../../utils/interpreters';
2626
import * as workspaceApis from '../../../client/common/vscodeApis/workspaceApis';
2727
import * as platform from '../../../client/common/utils/platform';
28+
import * as envApis from '../../../client/common/utils/envApis';
2829

2930
suite('Terminal Service', () => {
3031
let service: TerminalService;
@@ -98,7 +99,7 @@ suite('Terminal Service', () => {
9899
mockServiceContainer.setup((c) => c.get(ITerminalAutoActivation)).returns(() => terminalAutoActivator.object);
99100
getConfigurationStub = sinon.stub(workspaceApis, 'getConfiguration');
100101
isWindowsStub = sinon.stub(platform, 'isWindows');
101-
isWslStub = sinon.stub(platform, 'isWsl');
102+
isWslStub = sinon.stub(envApis, 'isWsl');
102103
pythonConfig = TypeMoq.Mock.ofType<WorkspaceConfiguration>();
103104
editorConfig = TypeMoq.Mock.ofType<WorkspaceConfiguration>();
104105
getConfigurationStub.callsFake((section: string) => {

0 commit comments

Comments
 (0)