Skip to content

fix: add ?? [] guards on all environment manager collection assignments #1444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edvilme merged 2 commits into from
Apr 8, 2026
Merged

fix: add ?? [] guards on all environment manager collection assignments #1444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba88698
Initial plan
Copilot Apr 8, 2026
27b6311
fix: add ?? [] null-coalescing guards to all environment manager coll…
Copilot Apr 8, 2026
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
2 changes: 1 addition & 1 deletion src/managers/builtin/sysPythonManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ export class SysPythonManager implements EnvironmentManager {
const discard = this.collection.map((c) => c);

// hit here is fine...
this.collection = await refreshPythons(hardRefresh, this.nativeFinder, this.api, this.log, this);
this.collection = (await refreshPythons(hardRefresh, this.nativeFinder, this.api, this.log, this)) ?? [];
await this.loadEnvMap();

const args = [
Expand Down
4 changes: 2 additions & 2 deletions src/managers/builtin/venvManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,14 +336,14 @@ export class VenvManager implements EnvironmentManager {
environment: env,
}));

this.collection = await findVirtualEnvironments(
this.collection = (await findVirtualEnvironments(
hardRefresh,
this.nativeFinder,
this.api,
this.log,
this,
scope ? [scope] : undefined,
);
)) ?? [];
await this.loadEnvMap();

const added = this.collection.map((env) => ({ environment: env, kind: EnvironmentChangeKind.add }));
Expand Down
6 changes: 3 additions & 3 deletions src/managers/conda/condaEnvManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export class CondaEnvManager implements EnvironmentManager, Disposable {
title: CondaStrings.condaDiscovering,
},
async () => {
this.collection = await refreshCondaEnvs(false, this.nativeFinder, this.api, this.log, this);
this.collection = (await refreshCondaEnvs(false, this.nativeFinder, this.api, this.log, this)) ?? [];
await this.loadEnvMap();

this._onDidChangeEnvironments.fire(
Expand Down Expand Up @@ -246,7 +246,7 @@ export class CondaEnvManager implements EnvironmentManager, Disposable {
async () => {
this.log.info('Refreshing Conda Environments');
const discard = this.collection.map((c) => c);
this.collection = await refreshCondaEnvs(true, this.nativeFinder, this.api, this.log, this);
this.collection = (await refreshCondaEnvs(true, this.nativeFinder, this.api, this.log, this)) ?? [];

await this.loadEnvMap();

Expand All @@ -273,7 +273,7 @@ export class CondaEnvManager implements EnvironmentManager, Disposable {
resolve: (p) => resolveCondaPath(p, this.nativeFinder, this.api, this.log, this),
startBackgroundInit: () =>
withProgress({ location: ProgressLocation.Window, title: CondaStrings.condaDiscovering }, async () => {
this.collection = await refreshCondaEnvs(false, this.nativeFinder, this.api, this.log, this);
this.collection = (await refreshCondaEnvs(false, this.nativeFinder, this.api, this.log, this)) ?? [];
await this.loadEnvMap();
this._onDidChangeEnvironments.fire(
this.collection.map((e) => ({
Expand Down
6 changes: 3 additions & 3 deletions src/managers/pipenv/pipenvManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export class PipenvManager implements EnvironmentManager, Disposable {
title: PipenvStrings.pipenvDiscovering,
},
async () => {
this.collection = await refreshPipenv(false, this.nativeFinder, this.api, this);
this.collection = (await refreshPipenv(false, this.nativeFinder, this.api, this)) ?? [];
await this.loadEnvMap();

this._onDidChangeEnvironments.fire(
Expand Down Expand Up @@ -181,7 +181,7 @@ export class PipenvManager implements EnvironmentManager, Disposable {
async () => {
traceInfo('Refreshing Pipenv Environments');
const oldCollection = [...this.collection];
this.collection = await refreshPipenv(hardRefresh, this.nativeFinder, this.api, this);
this.collection = (await refreshPipenv(hardRefresh, this.nativeFinder, this.api, this)) ?? [];
await this.loadEnvMap();

// Fire change events for environments that were added or removed
Expand Down Expand Up @@ -317,7 +317,7 @@ export class PipenvManager implements EnvironmentManager, Disposable {
withProgress(
{ location: ProgressLocation.Window, title: PipenvStrings.pipenvDiscovering },
async () => {
this.collection = await refreshPipenv(false, this.nativeFinder, this.api, this);
this.collection = (await refreshPipenv(false, this.nativeFinder, this.api, this)) ?? [];
await this.loadEnvMap();
this._onDidChangeEnvironments.fire(
this.collection.map((e) => ({
Expand Down
4 changes: 2 additions & 2 deletions src/managers/poetry/poetryManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export class PoetryManager implements EnvironmentManager, Disposable {
title: PoetryStrings.poetryDiscovering,
},
async () => {
this.collection = await refreshPoetry(false, this.nativeFinder, this.api, this);
this.collection = (await refreshPoetry(false, this.nativeFinder, this.api, this)) ?? [];
await this.loadEnvMap();

this._onDidChangeEnvironments.fire(
Expand Down Expand Up @@ -172,7 +172,7 @@ export class PoetryManager implements EnvironmentManager, Disposable {
async () => {
traceInfo('Refreshing Poetry Environments');
const discard = this.collection.map((c) => c);
this.collection = await refreshPoetry(true, this.nativeFinder, this.api, this);
this.collection = (await refreshPoetry(true, this.nativeFinder, this.api, this)) ?? [];

await this.loadEnvMap();

Expand Down
6 changes: 3 additions & 3 deletions src/managers/pyenv/pyenvManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export class PyEnvManager implements EnvironmentManager, Disposable {
title: PyenvStrings.pyenvDiscovering,
},
async () => {
this.collection = await refreshPyenv(false, this.nativeFinder, this.api, this);
this.collection = (await refreshPyenv(false, this.nativeFinder, this.api, this)) ?? [];
await this.loadEnvMap();

this._onDidChangeEnvironments.fire(
Expand Down Expand Up @@ -170,7 +170,7 @@ export class PyEnvManager implements EnvironmentManager, Disposable {
async () => {
traceInfo('Refreshing Pyenv Environments');
const discard = this.collection.map((c) => c);
this.collection = await refreshPyenv(true, this.nativeFinder, this.api, this);
this.collection = (await refreshPyenv(true, this.nativeFinder, this.api, this)) ?? [];

await this.loadEnvMap();

Expand Down Expand Up @@ -198,7 +198,7 @@ export class PyEnvManager implements EnvironmentManager, Disposable {
resolve: (p) => resolvePyenvPath(p, this.nativeFinder, this.api, this),
startBackgroundInit: () =>
withProgress({ location: ProgressLocation.Window, title: PyenvStrings.pyenvDiscovering }, async () => {
this.collection = await refreshPyenv(false, this.nativeFinder, this.api, this);
this.collection = (await refreshPyenv(false, this.nativeFinder, this.api, this)) ?? [];
await this.loadEnvMap();
this._onDidChangeEnvironments.fire(
this.collection.map((e) => ({
Expand Down
Loading