Revert "Fall back to old cached releases if user doesn't want to update or downloading the releases fails"

This reverts commit 15c8951.

Author: mduerig

src/hlsBinaries.ts

@@ -39,8 +39,6 @@ const githubReleaseApiValidator: validate.Validator<IRelease[]> = validate.array
 
 const cachedReleaseValidator: validate.Validator<IRelease[] | null> = validate.optional(githubReleaseApiValidator);
 
-const cachedReleaseValidatorOld: validate.Validator<IRelease | null> = validate.optional(releaseValidator);
-
 // On Windows the executable needs to be stored somewhere with an .exe extension
 const exeExt = process.platform === 'win32' ? '.exe' : '';
 
@@ -223,36 +221,10 @@ async function getReleaseMetadata(context: ExtensionContext, storagePath: string
 
   const offlineCache = path.join(storagePath, 'approvedReleases.cache.json');
 
-  async function readCachedReleaseData(fallBack: boolean): Promise<IRelease[] | null> {
+  async function readCachedReleaseData(): Promise<IRelease[] | null> {
     try {
       const cachedInfo = await promisify(fs.readFile)(offlineCache, { encoding: 'utf-8' });
       return validate.parseAndValidate(cachedInfo, cachedReleaseValidator);
-    } catch (err: any) {
-      // If file doesn't exist, return null unless fallBack is true. In that case try to
-      // read from the older cache file format (1.7.1 and earlier).
-      // Consider everything else it a failure
-      if (err.code === 'ENOENT') {
-        if (fallBack) {
-          return readOldCachedReleaseData();
-        } else {
-          return null;
-        }
-      }
-      throw err;
-    }
-  }
-
-  const offlineCacheOld = path.join(storagePath, 'latestApprovedRelease.cache.json');
-
-  async function readOldCachedReleaseData(): Promise<IRelease[] | null> {
-    try {
-      const cachedInfo = await promisify(fs.readFile)(offlineCacheOld, { encoding: 'utf-8' });
-      const cached = validate.parseAndValidate(cachedInfo, cachedReleaseValidatorOld);
-      if (cached) {
-        return [cached];
-      } else {
-        return null;
-      }
     } catch (err: any) {
       // If file doesn't exist, return null, otherwise consider it a failure
       if (err.code === 'ENOENT') {
@@ -261,12 +233,11 @@ async function getReleaseMetadata(context: ExtensionContext, storagePath: string
       throw err;
     }
   }
-
   // Not all users want to upgrade right away, in that case prompt
   const updateBehaviour = workspace.getConfiguration('haskell').get('updateBehavior') as UpdateBehaviour;
 
   if (updateBehaviour === 'never-check') {
-    return readCachedReleaseData(true)
+    return readCachedReleaseData();
   }
 
   try {
@@ -275,7 +246,7 @@ async function getReleaseMetadata(context: ExtensionContext, storagePath: string
       validate.parseAndValidate(releaseInfo, githubReleaseApiValidator).filter((x) => !x.prerelease) || null;
 
     if (updateBehaviour === 'prompt') {
-      const cachedInfoParsed = await readCachedReleaseData(false);
+      const cachedInfoParsed = await readCachedReleaseData();
 
       if (
         releaseInfoParsed !== null && releaseInfoParsed.length > 0 &&
@@ -290,7 +261,7 @@ async function getReleaseMetadata(context: ExtensionContext, storagePath: string
         const decision = await window.showInformationMessage(promptMessage, 'Download', 'Nevermind');
         if (decision !== 'Download') {
           // If not upgrade, bail and don't overwrite cached version information
-          return readCachedReleaseData(true);
+          return cachedInfoParsed;
         }
       }
     }
@@ -301,7 +272,7 @@ async function getReleaseMetadata(context: ExtensionContext, storagePath: string
   } catch (githubError: any) {
     // Attempt to read from the latest cached file
     try {
-      const cachedInfoParsed = await readCachedReleaseData(true);
+      const cachedInfoParsed = await readCachedReleaseData();
 
       window.showWarningMessage(
         `Couldn't get the latest haskell-language-server releases from GitHub, used local cache instead:\n${githubError.message}`