Return installation status for already installed dependencies

Author: JoeRobich

src/installRuntimeDependencies.ts

@@ -8,7 +8,7 @@ import { PackageInstallation, LogPlatformInfo, InstallationSuccess } from './sha
 import { EventStream } from './eventStream';
 import { getRuntimeDependenciesPackages } from './tools/runtimeDependencyPackageUtils';
 import { getAbsolutePathPackagesToInstall } from './packageManager/getAbsolutePathPackagesToInstall';
-import { DependencyInstallationResults, IInstallDependencies } from './packageManager/IInstallDependencies';
+import { DependencyInstallationStatus, IInstallDependencies } from './packageManager/IInstallDependencies';
 import { AbsolutePathPackage } from './packageManager/absolutePathPackage';
 
 export async function installRuntimeDependencies(
@@ -19,31 +19,39 @@ export async function installRuntimeDependencies(
     platformInfo: PlatformInformation,
     useFramework: boolean,
     requiredPackageIds: string[]
-): Promise<DependencyInstallationResults> {
+): Promise<DependencyInstallationStatus> {
     const runTimeDependencies = getRuntimeDependenciesPackages(packageJSON);
     const packagesToInstall = await getAbsolutePathPackagesToInstall(runTimeDependencies, platformInfo, extensionPath);
+
+    // PackagesToInstall will only return packages that are not already installed. However,
+    // we need to return the installation status of all required packages, so we need to
+    // track which required packages are already installed, so that we can return true for them.
+    const installedPackages = requiredPackageIds.filter(
+        (id) => packagesToInstall.find((pkg) => pkg.id === id) === undefined
+    );
+    const installedPackagesResults = installedPackages.reduce((acc, id) => ({ ...acc, [id]: true }), {});
+
     const filteredPackages = filterOmniSharpPackage(packagesToInstall, useFramework);
     const filteredRequiredPackages = filteredRequiredPackage(requiredPackageIds, filteredPackages);
 
-    if (filteredRequiredPackages.length > 0) {
-        eventStream.post(new PackageInstallation('C# dependencies'));
-        // Display platform information and RID
-        eventStream.post(new LogPlatformInfo(platformInfo));
+    if (filteredRequiredPackages.length === 0) {
+        return installedPackagesResults;
+    }
 
-        const installationResults = await installDependencies(filteredRequiredPackages);
+    eventStream.post(new PackageInstallation('C# dependencies'));
+    // Display platform information and RID
+    eventStream.post(new LogPlatformInfo(platformInfo));
 
-        const failedPackages = Object.entries(installationResults)
-            .filter(([, installed]) => !installed)
-            .map(([name]) => name);
-        if (failedPackages.length === 0) {
-            eventStream.post(new InstallationSuccess());
-        }
+    const installationResults = await installDependencies(filteredRequiredPackages);
 
-        return installationResults;
+    const failedPackages = Object.entries(installationResults)
+        .filter(([, installed]) => !installed)
+        .map(([name]) => name);
+    if (failedPackages.length === 0) {
+        eventStream.post(new InstallationSuccess());
     }
 
-    // There was nothing to install
-    return {};
+    return { ...installedPackagesResults, ...installationResults };
 }
 
 function filterOmniSharpPackage(packages: AbsolutePathPackage[], useFramework: boolean) {

src/packageManager/IInstallDependencies.ts

@@ -5,8 +5,8 @@
 
 import { AbsolutePathPackage } from './absolutePathPackage';
 
-export type DependencyInstallationResults = { [name: string]: boolean };
+export type DependencyInstallationStatus = { [name: string]: boolean };
 
 export interface IInstallDependencies {
-    (packages: AbsolutePathPackage[]): Promise<DependencyInstallationResults>;
+    (packages: AbsolutePathPackage[]): Promise<DependencyInstallationStatus>;
 }

src/packageManager/downloadAndInstallPackages.ts

@@ -17,7 +17,7 @@ import { PackageInstallStart } from '../shared/loggingEvents';
 import { DownloadValidator } from './isValidDownload';
 import { CancellationToken } from 'vscode';
 import { ITelemetryReporter } from '../shared/telemetryReporter';
-import { DependencyInstallationResults } from './IInstallDependencies';
+import { DependencyInstallationStatus } from './IInstallDependencies';
 
 export async function downloadAndInstallPackages(
     packages: AbsolutePathPackage[],
@@ -26,9 +26,9 @@ export async function downloadAndInstallPackages(
     downloadValidator: DownloadValidator,
     telemetryReporter?: ITelemetryReporter,
     token?: CancellationToken
-): Promise<DependencyInstallationResults> {
+): Promise<DependencyInstallationStatus> {
     eventStream.post(new PackageInstallStart());
-    const results: DependencyInstallationResults = {};
+    const results: DependencyInstallationStatus = {};
     for (const pkg of packages) {
         let installationStage = 'touchBeginFile';
         try {