save

Author: jpinkney-aws

packages/amazonq/src/lsp/activation.ts

@@ -11,7 +11,7 @@ import { ToolkitError } from 'aws-core-vscode/shared'
 export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
     try {
         const installResult = await new AmazonQLSPResolver().resolve()
-        await startLanguageServer(ctx, installResult.executablePaths)
+        await startLanguageServer(ctx, installResult.resourcePaths)
     } catch (err) {
         const e = err as ToolkitError
         void vscode.window.showInformationMessage(`Unable to launch amazonq language server: ${e.message}`)

packages/amazonq/src/lsp/client.ts

@@ -12,11 +12,11 @@ import { registerInlineCompletion } from '../inline/completion'
 import { AmazonQLspAuth, notificationTypes, writeEncryptionInit } from './auth'
 import { AuthUtil } from 'aws-core-vscode/codewhisperer'
 import { ConnectionMetadata } from '@aws/language-server-runtimes/protocol'
-import { ExecutablePaths } from 'aws-core-vscode/shared'
+import { ResourcePaths } from 'aws-core-vscode/shared'
 
 const localize = nls.loadMessageBundle()
 
-export function startLanguageServer(extensionContext: vscode.ExtensionContext, executablePaths: ExecutablePaths) {
+export function startLanguageServer(extensionContext: vscode.ExtensionContext, resourcePaths: ResourcePaths) {
     const toDispose = extensionContext.subscriptions
 
     // The debug options for the server
@@ -31,7 +31,7 @@ export function startLanguageServer(extensionContext: vscode.ExtensionContext, e
         ],
     }
 
-    const serverPath = executablePaths.lsp
+    const serverPath = resourcePaths.lsp
 
     // If the extension is launch in debug mode the debug server options are use
     // Otherwise the run options are used
@@ -40,7 +40,7 @@ export function startLanguageServer(extensionContext: vscode.ExtensionContext, e
         debug: { module: serverPath, transport: TransportKind.ipc, options: debugOptions },
     }
 
-    const child = cp.spawn(executablePaths.node, [serverPath, ...debugOptions.execArgv])
+    const child = cp.spawn(resourcePaths.node, [serverPath, ...debugOptions.execArgv])
     writeEncryptionInit(child.stdin)
 
     serverOptions = () => Promise.resolve(child)

packages/amazonq/src/lsp/lspInstaller.ts

@@ -27,7 +27,7 @@ export class AmazonQLSPResolver implements LspResolver {
                 assetDirectory: overrideLocation,
                 location: 'override',
                 version: '0.0.0',
-                executablePaths: {
+                resourcePaths: {
                     lsp: overrideLocation,
                     node: getNodeExecutableName(),
                 },
@@ -49,7 +49,7 @@ export class AmazonQLSPResolver implements LspResolver {
         // TODO Cleanup old versions of language servers
         return {
             ...installationResult,
-            executablePaths: {
+            resourcePaths: {
                 lsp: path.join(installationResult.assetDirectory, 'servers/aws-lsp-codewhisperer.js'),
                 node: nodePath,
             },

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

@@ -32,7 +32,7 @@ import {
 } from './types'
 import { Writable } from 'stream'
 import { CodeWhispererSettings } from '../../codewhisperer/util/codewhispererSettings'
-import { ExecutablePaths, fs, getLogger, globals } from '../../shared'
+import { ResourcePaths, fs, getLogger, globals } from '../../shared'
 
 const localize = nls.loadMessageBundle()
 
@@ -172,7 +172,7 @@ export class LspClient {
  * It will create a output channel named Amazon Q Language Server.
  * This function assumes the LSP server has already been downloaded.
  */
-export async function activate(extensionContext: ExtensionContext, executablePaths: ExecutablePaths) {
+export async function activate(extensionContext: ExtensionContext, resourcePaths: ResourcePaths) {
     LspClient.instance
     const toDispose = extensionContext.subscriptions
 
@@ -195,9 +195,9 @@ export async function activate(extensionContext: ExtensionContext, executablePat
         delete process.env.Q_WORKER_THREADS
     }
 
-    const serverModule = executablePaths.lsp
+    const serverModule = resourcePaths.lsp
 
-    const child = spawn(executablePaths.node, [serverModule, ...debugOptions.execArgv])
+    const child = spawn(resourcePaths.node, [serverModule, ...debugOptions.execArgv])
     // share an encryption key using stdin
     // follow same practice of DEXP LSP server
     writeEncryptionInit(child.stdin)

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

@@ -161,7 +161,7 @@ export class LspController {
         setImmediate(async () => {
             try {
                 const installResult = await new WorkspaceLSPResolver().resolve()
-                await activateLsp(context, installResult.executablePaths)
+                await activateLsp(context, installResult.resourcePaths)
                 getLogger().info('LspController: LSP activated')
                 void LspController.instance.buildIndex(buildIndexConfig)
                 // log the LSP server CPU and Memory usage per 30 minutes.

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

@@ -33,7 +33,7 @@ export class WorkspaceLSPResolver implements LspResolver {
         // TODO Cleanup old versions of language servers
         return {
             ...installationResult,
-            executablePaths: {
+            resourcePaths: {
                 lsp: path.join(
                     installationResult.assetDirectory,
                     `qserver-${process.platform}-${process.arch}/qserver/lspServer.js`

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

@@ -15,12 +15,12 @@ export interface LspResult {
     assetDirectory: string
 }
 
-export interface ExecutablePaths {
+export interface ResourcePaths {
     lsp: string
     node: string
 }
 export interface LspResolution extends LspResult {
-    executablePaths: ExecutablePaths
+    resourcePaths: ResourcePaths
 }
 
 export interface LspResolver {