fixup

Author: jpinkney-aws

packages/amazonq/src/lsp/activation.ts

@@ -4,12 +4,11 @@
  */
 
 import vscode from 'vscode'
-import path from 'path'
 import { AmazonQLSPDownloader } from './download'
 
 export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
-    const serverPath = ctx.asAbsolutePath(path.join('resources', 'qdeveloperserver'))
-    const clientPath = ctx.asAbsolutePath(path.join('resources', 'qdeveloperclient'))
+    const serverPath = ctx.asAbsolutePath('resources/qdeveloperserver')
+    const clientPath = ctx.asAbsolutePath('resources/qdeveloperclient')
     await new AmazonQLSPDownloader(serverPath, clientPath).tryInstallLsp()
 
     /**

packages/amazonq/src/lsp/download.ts

@@ -4,17 +4,17 @@
  */
 
 import {
-    LSPDownloader,
-    Manifest,
+    LspDownloader,
     getLogger,
     makeTemporaryToolkitFolder,
     tryRemoveFolder,
     fs,
+    Manifest,
 } from 'aws-core-vscode/shared'
 
 const manifestURL = 'https://aws-toolkit-language-servers.amazonaws.com/codewhisperer/0/manifest.json'
 
-export class AmazonQLSPDownloader extends LSPDownloader {
+export class AmazonQLSPDownloader extends LspDownloader {
     constructor(
         private readonly serverPath: string,
         private readonly clientPath: string

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

@@ -14,7 +14,7 @@ import { telemetry } from '../../shared/telemetry'
 import { isCloud9 } from '../../shared/extensionUtilities'
 import globals, { isWeb } from '../../shared/extensionGlobals'
 import { isAmazonInternalOs } from '../../shared/vscode/env'
-import { LSPDownloader, Manifest } from '../../shared/downloadLSP'
+import { LspDownloader, Manifest } from '../../shared/fetchLsp'
 import { fs } from '../../shared/fs/fs'
 import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../../shared/filesystemUtilities'
 
@@ -49,7 +49,7 @@ export interface BuildIndexConfig {
  *    Pre-process the input to Index Files API
  *    Post-process the output from Query API
  */
-export class LspController extends LSPDownloader {
+export class LspController extends LspDownloader {
     static #instance: LspController
     private _isIndexingInProgress = false
     private serverPath: string

packages/core/src/shared/downloadLSP.ts renamed to packages/core/src/shared/fetchLsp.ts

@@ -42,7 +42,7 @@ export interface Manifest {
     }[]
 }
 
-export abstract class LSPDownloader {
+export abstract class LspDownloader {
     constructor(
         private readonly manifestURL: string,
         private readonly supportedLspServerVersions?: string[]

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, Content } from './downloadLSP'
+export * from './fetchLsp'