cleanup

Author: Will-ShaoHua

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

@@ -27,7 +27,7 @@ describe('Amazon Q LSP client', function () {
     })
 
     it('encrypts payload of index files ', async () => {
-        await lspClient.indexFiles(['fileA'], 'path', false)
+        await lspClient.indexFiles(['fileA'], 'path', 'all')
         assert.ok(encryptFunc.calledOnce)
         assert.ok(
             encryptFunc.calledWith(

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

@@ -22,7 +22,6 @@ import {
     BuildIndexRequestType,
     GetUsageRequestType,
     IndexConfig,
-    IndexRequestType,
     QueryInlineProjectContextRequestType,
     QueryRequestType,
     UpdateIndexV2RequestPayload,
@@ -72,24 +71,7 @@ export class LspClient {
             .encrypt(key)
     }
 
-    async indexFiles(request: string[], rootPath: string, refresh: boolean) {
-        try {
-            const encryptedRequest = await this.encrypt(
-                JSON.stringify({
-                    filePaths: request,
-                    rootPath: rootPath,
-                    refresh: refresh,
-                })
-            )
-            const resp = await this.client?.sendRequest(IndexRequestType, encryptedRequest)
-            return resp
-        } catch (e) {
-            getLogger().error(`LspClient: indexFiles error: ${e}`)
-            return undefined
-        }
-    }
-
-    async indexFilesV2(paths: string[], rootPath: string, config: IndexConfig) {
+    async indexFiles(paths: string[], rootPath: string, config: IndexConfig) {
         const payload: BuildIndexRequestPayload = {
             filePaths: paths,
             projectRoot: rootPath,
@@ -144,9 +126,7 @@ export class LspClient {
         }
     }
 
-    // not yet account for file move
-    // v2
-    async updateIndexV2(filePath: string[], mode: 'update' | 'remove' | 'add') {
+    async updateIndex(filePath: string[], mode: 'update' | 'remove' | 'add') {
         const payload: UpdateIndexV2RequestPayload = {
             filePaths: filePath,
             updateMode: mode,
@@ -247,17 +227,17 @@ export async function activate(extensionContext: ExtensionContext) {
         }),
         vscode.window.onDidChangeActiveTextEditor((editor) => {
             if (savedDocument && editor && editor.document.uri.fsPath !== savedDocument.fsPath) {
-                void LspClient.instance.updateIndexV2([editor.document.uri.fsPath], 'update')
+                void LspClient.instance.updateIndex([editor.document.uri.fsPath], 'update')
             }
         }),
         vscode.workspace.onDidCreateFiles((e) => {
-            void LspClient.instance.updateIndexV2(
+            void LspClient.instance.updateIndex(
                 e.files.map((f) => f.fsPath),
                 'add'
             )
         }),
         vscode.workspace.onDidDeleteFiles((e) => {
-            void LspClient.instance.updateIndexV2(
+            void LspClient.instance.updateIndex(
                 e.files.map((f) => f.fsPath),
                 'remove'
             )

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

@@ -335,7 +335,7 @@ export class LspController {
             getLogger().info(`LspController: Found ${files.length} files in current project ${getProjectPaths()}`)
             const config = CodeWhispererSettings.instance.isLocalIndexEnabled() ? 'all' : 'default'
             const r = files.map((f) => f.fileUri.fsPath)
-            const resp = await LspClient.instance.indexFilesV2(r, projRoot, config)
+            const resp = await LspClient.instance.indexFiles(r, projRoot, config)
             if (resp) {
                 getLogger().debug(`LspController: Finish building index of project`)
                 const usage = await LspClient.instance.getLspServerUsage()

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

@@ -11,10 +11,6 @@ export type IndexRequestPayload = {
     refresh: boolean
 }
 
-export type IndexRequest = string
-
-export const IndexRequestType: RequestType<IndexRequest, any, any> = new RequestType('lsp/index')
-
 export type ClearRequest = string
 
 export const ClearRequestType: RequestType<ClearRequest, any, any> = new RequestType('lsp/clear')
@@ -23,10 +19,6 @@ export type QueryRequest = string
 
 export const QueryRequestType: RequestType<QueryRequest, any, any> = new RequestType('lsp/query')
 
-export type UpdateIndexRequest = string
-
-export const UpdateIndexRequestType: RequestType<UpdateIndexRequest, any, any> = new RequestType('lsp/updateIndex')
-
 export type GetUsageRequest = string
 
 export const GetUsageRequestType: RequestType<GetUsageRequest, any, any> = new RequestType('lsp/getUsage')

packages/core/src/testInteg/buildIndex.test.ts

@@ -10,7 +10,7 @@ import assert from 'assert'
 import { LspClient, LspController } from '../amazonq'
 import { LanguageClient, ServerOptions } from 'vscode-languageclient'
 import { createTestWorkspace } from '../test/testUtil'
-import { GetUsageRequestType, IndexRequestType } from '../amazonq/lsp/types'
+import { GetUsageRequestType } from '../amazonq/lsp/types'
 import { getRandomString } from '../shared'
 
 interface SetupResult {
@@ -19,7 +19,7 @@ interface SetupResult {
 
 async function verifyResult(setup: SetupResult) {
     assert.ok(setup.clientReqStub.calledTwice)
-    assert.ok(setup.clientReqStub.firstCall.calledWith(IndexRequestType))
+    // assert.ok(setup.clientReqStub.firstCall.calledWith(IndexRequestType))
     assert.ok(setup.clientReqStub.secondCall.calledWith(GetUsageRequestType))
 }