diff --git a/src/managers/builtin/sysPythonManager.ts b/src/managers/builtin/sysPythonManager.ts index 9c6946fa..4a2a21f7 100644 --- a/src/managers/builtin/sysPythonManager.ts +++ b/src/managers/builtin/sysPythonManager.ts @@ -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 = [ diff --git a/src/managers/builtin/venvManager.ts b/src/managers/builtin/venvManager.ts index 3c860e1e..fddea059 100644 --- a/src/managers/builtin/venvManager.ts +++ b/src/managers/builtin/venvManager.ts @@ -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 })); diff --git a/src/managers/conda/condaEnvManager.ts b/src/managers/conda/condaEnvManager.ts index e004b5d3..1db198b4 100644 --- a/src/managers/conda/condaEnvManager.ts +++ b/src/managers/conda/condaEnvManager.ts @@ -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( @@ -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(); @@ -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) => ({ diff --git a/src/managers/pipenv/pipenvManager.ts b/src/managers/pipenv/pipenvManager.ts index 411ada9c..3a8a2352 100644 --- a/src/managers/pipenv/pipenvManager.ts +++ b/src/managers/pipenv/pipenvManager.ts @@ -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( @@ -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 @@ -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) => ({ diff --git a/src/managers/poetry/poetryManager.ts b/src/managers/poetry/poetryManager.ts index 5a57f213..31a35e10 100644 --- a/src/managers/poetry/poetryManager.ts +++ b/src/managers/poetry/poetryManager.ts @@ -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( @@ -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(); diff --git a/src/managers/pyenv/pyenvManager.ts b/src/managers/pyenv/pyenvManager.ts index 1564347b..5602136f 100644 --- a/src/managers/pyenv/pyenvManager.ts +++ b/src/managers/pyenv/pyenvManager.ts @@ -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( @@ -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(); @@ -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) => ({