Merge master into feature/q-dev-ux

Author: aws-toolkit-automation

packages/amazonq/.changes/next-release/Bug Fix-3f76aff8-1622-4647-aafe-3210cf0c3b74.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q extension may fail to start if AWS Toolkit extension fails to start"
+}

packages/core/src/codewhisperer/commands/basicCommands.ts

@@ -462,7 +462,7 @@ export const registerToolkitApiCallback = Commands.declare(
             } else if (isExtensionActive(VSCODE_EXTENSION_ID.awstoolkit)) {
                 // when this command is executed by Amazon Q activation
                 const toolkitExt = vscode.extensions.getExtension(VSCODE_EXTENSION_ID.awstoolkit)
-                _toolkitApi = toolkitExt?.exports.getApi(VSCODE_EXTENSION_ID.amazonq)
+                _toolkitApi = toolkitExt?.exports?.getApi(VSCODE_EXTENSION_ID.amazonq)
             }
             if (_toolkitApi) {
                 registerToolkitApiCallbackOnce()

packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts

@@ -91,13 +91,22 @@ export class Messenger {
             )
         )
     }
-
+    /**
+     * Tries to calculate the total number of code blocks.
+     * NOTES:
+     *  - Not correct on all examples. Some may cause it to return 0 unexpectedly.
+     *  - Plans in place (as of 4/22/2024) to move this server side.
+     *  - See original pr: https://github.com/aws/aws-toolkit-vscode/pull/4761 for more details.
+     * @param message raw message response from codewhisperer client.
+     * @returns count of multi-line code blocks in response.
+     */
     public async countTotalNumberOfCodeBlocks(message: string): Promise<number> {
+        //TODO: remove this when moved to server-side.
         if (message === undefined) {
             return 0
         }
 
-        // // To Convert Markdown text to HTML using marked library
+        // To Convert Markdown text to HTML using marked library
         const html = await marked(message)
 
         const dom = new JSDOM(html)

packages/core/src/login/webview/vue/amazonq/backend_amazonq.ts

@@ -45,7 +45,7 @@ export class AmazonQLoginWebview extends CommonAuthWebview {
         }
         await activateExtension(VSCODE_EXTENSION_ID.awstoolkit)
         const toolkitExt = vscode.extensions.getExtension(VSCODE_EXTENSION_ID.awstoolkit)
-        const importedApi = toolkitExt?.exports.getApi(VSCODE_EXTENSION_ID.amazonq)
+        const importedApi = toolkitExt?.exports?.getApi(VSCODE_EXTENSION_ID.amazonq)
         if (importedApi && 'listConnections' in importedApi) {
             return ((await importedApi?.listConnections()) as AwsConnection[]).filter(
                 // No need to display Builder ID as an existing connection,

packages/core/src/test/shared/credentials/userCredentialsUtils.test.ts

@@ -21,15 +21,6 @@ import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
 import { getConfigFilename, getCredentialsFilename } from '../../../auth/credentials/sharedCredentialsFile'
 import { fs } from '../../../shared'
 
-/** Async version of "doesNotThrow" */
-async function assertDoesNotThrow(fn: () => Promise<void>): Promise<void> {
-    try {
-        await fn()
-    } catch (err) {
-        assert.fail(`Provided function threw error ${err}`)
-    }
-}
-
 describe('UserCredentialsUtils', function () {
     let tempFolder: string
     let defaultConfigFileName: string
@@ -151,8 +142,8 @@ describe('UserCredentialsUtils', function () {
                 `creds.secretKey: "${profile.aws_access_key_id}" !== "${creds.secretKey}"`
             )
 
-            await assertDoesNotThrow(async () => await fs.checkPerms(credentialsFilename, 'r--'))
-            await assertDoesNotThrow(async () => await fs.checkPerms(credentialsFilename, '-w-'))
+            await assert.doesNotReject(async () => await fs.checkPerms(credentialsFilename, 'r--'))
+            await assert.doesNotReject(async () => await fs.checkPerms(credentialsFilename, '-w-'))
         })
     })