feat(amazonq): integrate workspace context with inline completion

Author: Jiatong Li

app/aws-lsp-codewhisperer-runtimes/webpack.config.js

@@ -83,6 +83,11 @@ const webworkerConfig = {
             fs: path.resolve(__dirname, 'src/mock-fs.js'),
             child_process: false,
             vm: false,
+            dns: false,
+            zlib: false,
+            net: false,
+            tls: false,
+            http2: false,
         },
         extensions: ['.ts', '.tsx', '.js', '.jsx'],
     },

server/aws-lsp-codewhisperer/src/language-server/inline-completion/codeWhispererServer.ts

@@ -49,7 +49,7 @@ import { getOrThrowBaseTokenServiceManager } from '../../shared/amazonQServiceMa
 import { AmazonQWorkspaceConfig } from '../../shared/amazonQServiceManager/configurationUtils'
 import { hasConnectionExpired } from '../../shared/utils'
 import { getOrThrowBaseIAMServiceManager } from '../../shared/amazonQServiceManager/AmazonQIAMServiceManager'
-// import { WorkspaceFolderManager } from '../workspaceContext/workspaceFolderManager'
+import { WorkspaceFolderManager } from '../workspaceContext/workspaceFolderManager'
 import path = require('path')
 import { getRelativePath } from '../workspaceContext/util'
 import { UserWrittenCodeTracker } from '../../shared/userWrittenCodeTracker'
@@ -346,8 +346,10 @@ export const CodewhispererServerFactory =
                     const maxResults = isAutomaticLspTriggerKind ? 1 : 5
                     const selectionRange = params.context.selectedCompletionInfo?.range
                     const fileContext = getFileContext({ textDocument, inferredLanguageId, position: params.position })
-                    // const workspaceFolder = WorkspaceFolderManager.getInstance()?.getWorkspaceFolder(params.textDocument.uri)
-                    // const workspaceId = WorkspaceFolderManager.getInstance()?.getWorkspaceId(workspaceFolder)
+                    const workspaceState = WorkspaceFolderManager.getInstance()?.getWorkspaceState()
+                    const workspaceId = workspaceState?.webSocketClient?.isConnected()
+                        ? workspaceState.workspaceId
+                        : undefined
                     // TODO: Can we get this derived from a keyboard event in the future?
                     // This picks the last non-whitespace character, if any, before the cursor
                     const triggerCharacter = fileContext.leftFileContent.trim().at(-1) ?? ''
@@ -450,7 +452,7 @@ export const CodewhispererServerFactory =
                                     .slice(0, CONTEXT_CHARACTERS_LIMIT)
                                     .replaceAll('\r\n', '\n'),
                             },
-                            // workspaceId: workspaceId,
+                            ...(workspaceId ? { workspaceId: workspaceId } : {}),
                         })
                         .then(async suggestionResponse => {
                             return processSuggestionResponse(suggestionResponse, newSession, true, selectionRange)