Merge branch 'aws:master' into feature/folderscans

Author: laileni-aws

packages/amazonq/.changes/next-release/Bug Fix-17572ed1-4601-4554-9144-9eb5143bf0ff.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q inline suggestions: remember `Pause Auto-Suggestions` after IDE restart"
+}

packages/amazonq/src/extensionCommon.ts

@@ -7,7 +7,6 @@ import * as vscode from 'vscode'
 import * as semver from 'semver'
 import { join } from 'path'
 import {
-    CodeSuggestionsState,
     activate as activateCodeWhisperer,
     shutdown as shutdownCodeWhisperer,
     amazonQDismissedKey,
@@ -113,9 +112,6 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
     // reload webviews
     await vscode.commands.executeCommand('workbench.action.webview.reloadWebviewAction')
 
-    // enable auto suggestions on activation
-    await CodeSuggestionsState.instance.setSuggestionsEnabled(true)
-
     if (AuthUtils.ExtensionUse.instance.isFirstUse()) {
         CommonAuthWebview.authSource = ExtStartUpSources.firstStartUp
         await vscode.commands.executeCommand('workbench.view.extension.amazonq')

packages/core/src/login/webview/vue/login.vue

@@ -366,13 +366,16 @@ export default defineComponent({
         await this.emitUpdate('created')
     },
 
-    mounted() {
+    async mounted() {
         this.fetchRegions()
-        void this.updateExistingConnections()
+        await this.updateExistingConnections()
 
         // Reset gathered telemetry data each time we view the login page.
         // The webview panel is reset on each view of the login page by design.
-        void client.resetStoredMetricMetadata()
+        client.resetStoredMetricMetadata()
+
+        // Pre-select the first available login option
+        await this.preselectLoginOption()
     },
     methods: {
         toggleItemSelection(itemId: number) {
@@ -563,6 +566,17 @@ export default defineComponent({
         handleHelpLinkClick() {
             void client.emitUiClick('auth_helpLink')
         },
+        async preselectLoginOption() {
+            // Select the first available option for Login
+            if (this.existingLogins.length > 0) {
+                this.selectedLoginOption = LoginOption.EXISTING_LOGINS
+            } else if (this.app === 'AMAZONQ') {
+                this.selectedLoginOption = LoginOption.BUILDER_ID
+            } else if (this.app === 'TOOLKIT') {
+                this.selectedLoginOption = LoginOption.ENTERPRISE_SSO
+            }
+            this.$forceUpdate()
+        },
         shouldDisableSsoContinue() {
             return this.startUrl.length == 0 || this.startUrlError.length > 0 || !this.selectedRegion
         },

packages/core/src/test/codewhisperer/commands/transformByQ.test.ts

@@ -179,7 +179,7 @@ describe('transformByQ', function () {
                 status: 'COMPLETED',
             },
         }
-        assert.deepStrictEqual(actual, expected)
+        assert.equal(actual['abc-123'].projectName, expected['abc-123'].projectName)
     })
 
     it(`WHEN get headers for upload artifact to S3 THEN returns correct header with kms key arn`, function () {