Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Format EnvExt adapter changes
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 2f537bc5-b389-4ee2-aac2-e2b83be47f5c
  • Loading branch information
StellaHuang95 and Copilot committed Aug 14, 2026
commit c7c86db49fdaecf5e17f827906496c00619da9c6
4 changes: 3 additions & 1 deletion src/client/envExt/envExtApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,9 @@ class EnvExtApis implements IDiscoveryAPI, Disposable {
}
} catch (error) {
traceError(
`Failed to process environment change for "${item?.environment?.displayName ?? 'unknown environment'}" from the Python Environments extension`,
`Failed to process environment change for "${
item?.environment?.displayName ?? 'unknown environment'
}" from the Python Environments extension`,
error,
);
}
Expand Down
26 changes: 8 additions & 18 deletions src/test/envExt/envExtApi.unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ suite('Python Environments extension discovery adapter', () => {
environmentChanges = new EventEmitter<DidChangeEnvironmentsEventArgs>();
activeEnvironmentChanges = new EventEmitter<DidChangeEnvironmentEventArgs>();
disposables = [];
envExtApi = {
envExtApi = ({
onDidChangeEnvironments: environmentChanges.event,
onDidChangeEnvironment: activeEnvironmentChanges.event,
refreshEnvironments: sinon.stub().resolves(),
resolveEnvironment: sinon.stub().resolves(undefined),
} as unknown as PythonEnvironmentApi;
} as unknown) as PythonEnvironmentApi;
sinon.stub(apiInternal, 'getEnvExtApi').resolves(envExtApi);
});

Expand Down Expand Up @@ -80,10 +80,7 @@ suite('Python Environments extension discovery adapter', () => {
first.execInfo.run.executable,
second.execInfo.run.executable,
]);
expect(events.map((event) => event.type)).to.deep.equal([
FileChangeType.Created,
FileChangeType.Created,
]);
expect(events.map((event) => event.type)).to.deep.equal([FileChangeType.Created, FileChangeType.Created]);
});

test('isolates an unexpected invalid version from later environments in the batch', async () => {
Expand Down Expand Up @@ -112,17 +109,15 @@ suite('Python Environments extension discovery adapter', () => {

expect(() =>
environmentChanges.fire([
{
({
kind: EnvironmentChangeKind.remove,
environment: undefined,
} as unknown as DidChangeEnvironmentsEventArgs[number],
} as unknown) as DidChangeEnvironmentsEventArgs[number],
{ kind: EnvironmentChangeKind.add, environment: valid },
]),
).not.to.throw();

expect(api.getEnvs().map((env) => env.executable.filename)).to.deep.equal([
valid.execInfo.run.executable,
]);
expect(api.getEnvs().map((env) => env.executable.filename)).to.deep.equal([valid.execInfo.run.executable]);
});

test('does not publish an active-environment event for a no-Python environment', async () => {
Expand Down Expand Up @@ -195,10 +190,7 @@ suite('Python Environments extension discovery adapter', () => {
environmentChanges.fire([{ kind: EnvironmentChangeKind.remove, environment }]);

expect(api.getEnvs()).to.be.empty;
expect(events.map((event) => event.type)).to.deep.equal([
FileChangeType.Created,
FileChangeType.Deleted,
]);
expect(events.map((event) => event.type)).to.deep.equal([FileChangeType.Created, FileChangeType.Deleted]);
expect(events[1].old?.executable.filename).to.equal(environment.execInfo.run.executable);
});

Expand Down Expand Up @@ -238,8 +230,6 @@ suite('Python Environments extension discovery adapter', () => {

await api.triggerRefresh();

expect(api.getEnvs().map((env) => env.executable.filename)).to.deep.equal([
valid.execInfo.run.executable,
]);
expect(api.getEnvs().map((env) => env.executable.filename)).to.deep.equal([valid.execInfo.run.executable]);
});
});
Loading