fixup

Author: jpinkney-aws

packages/core/src/shared/fs/fs.ts

@@ -600,6 +600,34 @@ export class FileSystem {
         return this.#homeDir
     }
 
+    /**
+     * Gets the application cache folder for the current platform
+     *
+     * Follows the cache_dir convention outlined in https://crates.io/crates/dirs
+     */
+    getCacheDir(): string {
+        switch (process.platform) {
+            case 'darwin': {
+                return _path.join(this.getUserHomeDir(), 'Library/Caches')
+            }
+            case 'win32': {
+                const localAppData = process.env.LOCALAPPDATA
+                if (!localAppData) {
+                    throw new ToolkitError('LOCALAPPDATA environment variable not set', {
+                        code: 'LocalAppDataNotFound',
+                    })
+                }
+                return localAppData
+            }
+            case 'linux': {
+                return _path.join(this.getUserHomeDir(), '.cache')
+            }
+            default: {
+                throw new Error(`Unsupported platform: ${process.platform}. Expected 'darwin', 'win32', or 'linux'.`)
+            }
+        }
+    }
+
     /**
      * Gets the (cached) username for this session, or "webuser" in web-mode, or "unknown-user" if
      * a username could not be resolved.

packages/core/src/shared/languageServer/lspResolver.ts

@@ -10,7 +10,6 @@ import * as path from 'path'
 import { FileType } from 'vscode'
 import AdmZip from 'adm-zip'
 import { TargetContent, logger, LspResult, LspVersion, Manifest } from './types'
-import { getApplicationCacheFolder } from '../vscode/env'
 import { createHash } from '../crypto'
 import request from '../request'
 
@@ -341,7 +340,7 @@ export class LanguageServerResolver {
     }
 
     private defaultDownloadFolder() {
-        const applicationCacheFolder = getApplicationCacheFolder()
+        const applicationCacheFolder = fs.getCacheDir()
         return path.join(applicationCacheFolder, `aws/toolkits/language-servers/${this.lsName}`)
     }
 

packages/core/src/shared/vscode/env.ts

@@ -12,9 +12,6 @@ import { onceChanged } from '../utilities/functionUtils'
 import { ChildProcess } from '../utilities/processUtils'
 import globals, { isWeb } from '../extensionGlobals'
 import * as devConfig from '../../dev/config'
-import path from 'path'
-import { fs } from '../fs/fs'
-import { ToolkitError } from '../errors'
 
 /**
  * Returns true if the current build is running on CI (build server).
@@ -273,32 +270,3 @@ export async function getMachineId(): Promise<string> {
     // TODO: check exit code.
     return (await proc.run()).stdout.trim() ?? 'unknown-host'
 }
-
-/**
- * Gets the application cache folder for the current platform
- *
- * Follows the cache_dir convention outlined in https://crates.io/crates/dirs
- */
-export function getApplicationCacheFolder() {
-    const homeDir = fs.getUserHomeDir()
-    switch (process.platform) {
-        case 'darwin': {
-            return path.join(homeDir, 'Library/Caches')
-        }
-        case 'win32': {
-            const localAppData = process.env.LOCALAPPDATA
-            if (!localAppData) {
-                throw new ToolkitError('LOCALAPPDATA environment variable not set', {
-                    code: 'LocalAppDataNotFound',
-                })
-            }
-            return localAppData
-        }
-        case 'linux': {
-            return path.join(homeDir, '.cache')
-        }
-        default: {
-            throw new Error(`Unsupported platform: ${process.platform}. Expected 'darwin', 'win32', or 'linux'.`)
-        }
-    }
-}