refactor: rename cleanup function and move test file

Author: Hweinstock

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 '../../shared'
+import { cleanLspDownloads } 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
@@ -31,7 +31,7 @@ export class WorkspaceLSPResolver implements LspResolver {
         const nodePath = path.join(installationResult.assetDirectory, nodeName)
         await fs.chmod(nodePath, 0o755)
 
-        await cleanUpLSPDownloads(manifest.versions, path.basename(installationResult.assetDirectory))
+        await cleanLspDownloads(manifest.versions, path.basename(installationResult.assetDirectory))
         return {
             ...installationResult,
             resourcePaths: {

packages/core/src/shared/lsp/utils/cleanup.ts

@@ -22,7 +22,7 @@ function isDelisted(manifestVersions: LspVersion[], targetVersion: string): bool
  * @param manifest
  * @param downloadDirectory
  */
-export async function cleanUpLSPDownloads(manifestVersions: LspVersion[], downloadDirectory: string): Promise<void> {
+export async function cleanLspDownloads(manifestVersions: LspVersion[], downloadDirectory: string): Promise<void> {
     const downloadedVersions = await getDownloadedVersions(downloadDirectory)
     const [delistedVersions, remainingVersions] = partition(downloadedVersions, (v: string) =>
         isDelisted(manifestVersions, v)

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

@@ -4,7 +4,7 @@
  */
 
 import { Uri } from 'vscode'
-import { cleanUpLSPDownloads, fs } from '../../../shared'
+import { cleanLspDownloads, fs } from '../../../shared'
 import { createTestWorkspaceFolder } from '../../testUtil'
 import path from 'path'
 import assert from 'assert'
@@ -21,7 +21,7 @@ async function fakeInstallVersions(versions: string[], installationDir: string):
     }
 }
 
-describe('cleanUpLSPDownloads', function () {
+describe('cleanLSPDownloads', function () {
     let installationDir: Uri
 
     before(async function () {
@@ -41,7 +41,7 @@ describe('cleanUpLSPDownloads', function () {
 
     it('keeps two newest versions', async function () {
         await fakeInstallVersions(['1.0.0', '1.0.1', '1.1.1', '2.1.1'], installationDir.fsPath)
-        await cleanUpLSPDownloads([], installationDir.fsPath)
+        await cleanLspDownloads([], installationDir.fsPath)
 
         const result = (await fs.readdir(installationDir.fsPath)).map(([filename, _filetype], _index) => filename)
         assert.strictEqual(result.length, 2)
@@ -51,7 +51,7 @@ describe('cleanUpLSPDownloads', function () {
 
     it('deletes delisted versions', async function () {
         await fakeInstallVersions(['1.0.0', '1.0.1', '1.1.1', '2.1.1'], installationDir.fsPath)
-        await cleanUpLSPDownloads([{ serverVersion: '1.1.1', isDelisted: true, targets: [] }], installationDir.fsPath)
+        await cleanLspDownloads([{ serverVersion: '1.1.1', isDelisted: true, targets: [] }], installationDir.fsPath)
 
         const result = (await fs.readdir(installationDir.fsPath)).map(([filename, _filetype], _index) => filename)
         assert.strictEqual(result.length, 2)
@@ -61,7 +61,7 @@ describe('cleanUpLSPDownloads', function () {
 
     it('handles case where less than 2 versions are not delisted', async function () {
         await fakeInstallVersions(['1.0.0', '1.0.1', '1.1.1', '2.1.1'], installationDir.fsPath)
-        await cleanUpLSPDownloads(
+        await cleanLspDownloads(
             [
                 { serverVersion: '1.1.1', isDelisted: true, targets: [] },
                 { serverVersion: '2.1.1', isDelisted: true, targets: [] },
@@ -77,15 +77,15 @@ describe('cleanUpLSPDownloads', function () {
 
     it('handles case where less than 2 versions exist', async function () {
         await fakeInstallVersions(['1.0.0'], installationDir.fsPath)
-        await cleanUpLSPDownloads([], installationDir.fsPath)
+        await cleanLspDownloads([], installationDir.fsPath)
 
         const result = (await fs.readdir(installationDir.fsPath)).map(([filename, _filetype], _index) => filename)
         assert.strictEqual(result.length, 1)
     })
 
     it('does not install delisted version when no other option exists', async function () {
         await fakeInstallVersions(['1.0.0'], installationDir.fsPath)
-        await cleanUpLSPDownloads([{ serverVersion: '1.0.0', isDelisted: true, targets: [] }], installationDir.fsPath)
+        await cleanLspDownloads([{ serverVersion: '1.0.0', isDelisted: true, targets: [] }], installationDir.fsPath)
 
         const result = (await fs.readdir(installationDir.fsPath)).map(([filename, _filetype], _index) => filename)
         assert.strictEqual(result.length, 0)