refactor: move cleanup work to more general location

Author: Hweinstock

packages/amazonq/src/lsp/lspInstaller.ts

@@ -12,9 +12,9 @@ import {
     fs,
     LspResolution,
     getNodeExecutableName,
+    cleanUpLSPDownloads,
 } from 'aws-core-vscode/shared'
 import path from 'path'
-import { cleanUpLSPDownloads } from 'aws-core-vscode/amazonq'
 
 const manifestURL = 'https://aws-toolkit-language-servers.amazonaws.com/codewhisperer/0/manifest.json'
 export const supportedLspServerVersions = '^2.3.0'

packages/core/src/amazonq/index.ts

@@ -17,7 +17,6 @@ export {
 } from './onboardingPage/walkthrough'
 export { LspController } from './lsp/lspController'
 export { LspClient } from './lsp/lspClient'
-export { cleanUpLSPDownloads } from './lsp/util'
 export { api } from './extApi'
 export { AmazonQChatViewProvider } from './webview/webView'
 export { init as cwChatAppInit } from '../codewhispererChat/app'

packages/core/src/amazonq/lsp/workspaceInstaller.ts

@@ -10,7 +10,7 @@ import { LanguageServerResolver } from '../../shared/lsp/lspResolver'
 import { Range } from 'semver'
 import { getNodeExecutableName } from '../../shared/lsp/utils/platform'
 import { fs } from '../../shared/fs/fs'
-import { cleanUpLSPDownloads } from './util'
+import { cleanUpLSPDownloads } from '../../shared'
 
 const manifestUrl = 'https://aws-toolkit-language-servers.amazonaws.com/q-context/manifest.json'
 // this LSP client in Q extension is only going to work with these LSP server versions

packages/core/src/shared/index.ts

@@ -63,6 +63,7 @@ export { TabTypeDataMap } from '../amazonq/webview/ui/tabs/constants'
 export * from './lsp/manifestResolver'
 export * from './lsp/lspResolver'
 export * from './lsp/types'
+export * from './lsp/utils/cleanup'
 export { default as request } from './request'
 export * from './lsp/utils/platform'
 export * as processUtils from './utilities/processUtils'

packages/core/src/amazonq/lsp/util.ts renamed to packages/core/src/shared/lsp/utils/cleanup.ts

@@ -4,12 +4,12 @@
  */
 
 import path from 'path'
-import { LspVersion } from '../../shared'
-import { fs } from '../../shared/fs/fs'
-import { partition } from '../../shared/utilities/tsUtils'
+import { LspVersion } from '../types'
+import { fs } from '../../../shared/fs/fs'
+import { partition } from '../../../shared/utilities/tsUtils'
 import { sort } from 'semver'
 
-export async function getDownloadedVersions(installLocation: string) {
+async function getDownloadedVersions(installLocation: string) {
     return (await fs.readdir(installLocation)).map(([f, _], __) => f)
 }
 

packages/core/src/test/amazonq/lsp/util.test.ts

@@ -4,11 +4,10 @@
  */
 
 import { Uri } from 'vscode'
-import { fs } from '../../../shared'
+import { cleanUpLSPDownloads, fs } from '../../../shared'
 import { createTestWorkspaceFolder } from '../../testUtil'
 import path from 'path'
 import assert from 'assert'
-import { cleanUpLSPDownloads } from '../../../amazonq/lsp/util'
 
 async function fakeInstallVersion(version: string, installationDir: string): Promise<void> {
     const versionDir = path.join(installationDir, version)