Skip to content

Commit da5414d

Browse files
committed
Add support for environment extension in interpreter retrieval
1 parent ac013cd commit da5414d

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

src/client/startupTelemetry.ts

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { sendTelemetryEvent } from './telemetry';
1616
import { EventName } from './telemetry/constants';
1717
import { EditorLoadTelemetry } from './telemetry/types';
1818
import { IStartupDurations } from './types';
19+
import { useEnvExtension } from './envExt/api.internal';
1920

2021
export async function sendStartupTelemetry(
2122
activatedPromise: Promise<any>,
@@ -105,9 +106,19 @@ async function getActivationTelemetryProps(
105106
// finish. API getActiveInterpreter() does not block on windows registry by default as
106107
// it is slow.
107108
await interpreterService.refreshPromise;
108-
const interpreter = await interpreterService
109-
.getActiveInterpreter(mainWorkspaceUri)
110-
.catch<PythonEnvironment | undefined>(() => undefined);
109+
let interpreter: PythonEnvironment | undefined;
110+
111+
// include main workspace uri if using env extension
112+
if (useEnvExtension()) {
113+
interpreter = await interpreterService
114+
.getActiveInterpreter(mainWorkspaceUri)
115+
.catch<PythonEnvironment | undefined>(() => undefined);
116+
} else {
117+
interpreter = await interpreterService
118+
.getActiveInterpreter()
119+
.catch<PythonEnvironment | undefined>(() => undefined);
120+
}
121+
111122
const pythonVersion = interpreter && interpreter.version ? interpreter.version.raw : undefined;
112123
const interpreterType = interpreter ? interpreter.envType : undefined;
113124
if (interpreterType === EnvironmentType.Unknown) {

0 commit comments

Comments
 (0)