save

Author: jpinkney-aws

packages/amazonq/src/lsp/activation.ts

@@ -4,12 +4,13 @@
  */
 
 import vscode from 'vscode'
+import path from 'path'
 import { AmazonQLSPDownloader } from './download'
 
 export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
     // use the codewhisperer language server
-    const serverPath = ctx.asAbsolutePath('dist/amazonqLSP/server.js')
-    const clientPath = ctx.asAbsolutePath('dist/amazonqLSP/client.js')
+    const serverPath = ctx.asAbsolutePath(path.join('resources', 'qdeveloperserver'))
+    const clientPath = ctx.asAbsolutePath(path.join('resources', 'qdeveloperclient'))
     await new AmazonQLSPDownloader(serverPath, clientPath).tryInstallLsp()
 
     /**

packages/amazonq/src/lsp/download.ts

@@ -50,8 +50,22 @@ export class AmazonQLSPDownloader extends LSPDownloader {
 
         try {
             tempFolder = await makeTemporaryToolkitFolder()
-            await this.downloadAndExtractServer(server, this.serverPath, 'qdeveloperserver', tempFolder)
-            await this.downloadAndExtractServer(clients, this.clientPath, 'qdeveloperclient', tempFolder)
+
+            // the business logic
+            await this.downloadAndExtractServer({
+                content: server,
+                installLocation: this.serverPath,
+                name: 'qdeveloperserver',
+                tempFolder,
+            })
+
+            // mynah ui
+            await this.downloadAndExtractServer({
+                content: clients,
+                installLocation: this.clientPath,
+                name: 'qdeveloperclient',
+                tempFolder,
+            })
         } finally {
             // clean up temp folder
             if (tempFolder) {

packages/amazonq/test/unit/amazonq/lsp/lspController.test.ts

@@ -4,9 +4,9 @@
  */
 import assert from 'assert'
 import sinon from 'sinon'
-import { Content, LspController } from 'aws-core-vscode/amazonq'
+import { LspController } from 'aws-core-vscode/amazonq'
 import { createTestFile } from 'aws-core-vscode/test'
-import { fs } from 'aws-core-vscode/shared'
+import { fs, Content } from 'aws-core-vscode/shared'
 
 describe('Amazon Q LSP controller', function () {
     it('Download mechanism checks against hash, when hash matches', async function () {

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

@@ -198,7 +198,13 @@ export class LspController extends LSPDownloader {
 
         try {
             tempFolder = await makeTemporaryToolkitFolder()
-            await this.downloadAndExtractServer(server, this.serverPath, 'qserver', tempFolder)
+            await this.downloadAndExtractServer({
+                content: server,
+                installLocation: this.serverPath,
+                name: 'qserver',
+                tempFolder,
+                extractToTempFolder: true,
+            })
 
             const runtimeTempPath = path.join(tempFolder, nodeBinName)
             await this.installRuntime(runtime, this.nodePath, runtimeTempPath)

packages/core/src/shared/downloadLSP.ts

@@ -142,15 +142,29 @@ export abstract class LSPDownloader {
     /**
      * Downloads servers.zip, clients.zip, qserver.zip and then extracts them
      */
-    async downloadAndExtractServer(server: Content, installLocation: string, name: string, tempFolder: string) {
-        const qserverZipTempPath = path.join(tempFolder, `${name}.zip`)
-        const downloadOk = await this.downloadAndCheckHash(qserverZipTempPath, server)
+    async downloadAndExtractServer({
+        content,
+        installLocation,
+        name,
+        tempFolder,
+        extractToTempFolder = false,
+    }: {
+        content: Content
+        installLocation: string
+        name: string
+        tempFolder: string
+        extractToTempFolder?: boolean
+    }) {
+        const serverZipTempPath = path.join(tempFolder, `${name}.zip`)
+        const downloadOk = await this.downloadAndCheckHash(serverZipTempPath, content)
         if (!downloadOk) {
             return false
         }
 
-        const zip = new AdmZip(qserverZipTempPath)
-        zip.extractAllTo(tempFolder)
+        // load the zip contents
+        const extractPath = extractToTempFolder ? tempFolder : path.join(tempFolder, name)
+        new AdmZip(serverZipTempPath).extractAllTo(extractPath)
+
         await fs.rename(path.join(tempFolder, name), installLocation)
     }
 

packages/core/src/shared/index.ts

@@ -59,4 +59,4 @@ export { i18n } from './i18n-helper'
 export * from './icons'
 export * as textDocumentUtil from './utilities/textDocumentUtilities'
 export { TabTypeDataMap } from '../amazonq/webview/ui/tabs/constants'
-export { LSPDownloader, Manifest } from './downloadLSP'
+export { LSPDownloader, Manifest, Content } from './downloadLSP'