File tree Expand file tree Collapse file tree 4 files changed +14
-7
lines changed Expand file tree Collapse file tree 4 files changed +14
-7
lines changed Original file line number Diff line number Diff line change @@ -21,7 +21,8 @@ import {
2121} from './types' ;
2222import { traceVerbose } from '../../logging' ;
2323import { 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 ( )
2728export class TerminalService implements ITerminalService , Disposable {
Original file line number Diff line number Diff line change 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+ }
Original file line number Diff line number Diff line change 33
44'use strict' ;
55
6- import { env } from 'vscode' ;
76import { EnvironmentVariables } from '../variables/types' ;
87export 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-
3732const architectures : Record < string , Architecture > = {
3833 x86 : Architecture . x86 , // 32-bit
3934 x64 : Architecture . x64 , // 64-bit
Original file line number Diff line number Diff line change @@ -25,6 +25,7 @@ import { ITerminalAutoActivation } from '../../../client/terminals/types';
2525import { createPythonInterpreter } from '../../utils/interpreters' ;
2626import * as workspaceApis from '../../../client/common/vscodeApis/workspaceApis' ;
2727import * as platform from '../../../client/common/utils/platform' ;
28+ import * as envApis from '../../../client/common/utils/envApis' ;
2829
2930suite ( '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 ) => {
You can’t perform that action at this time.
0 commit comments