Merge master into feature/sdkv3

Author: aws-toolkit-automation

packages/amazonq/.changes/next-release/Feature-b0ddb09f-ae4a-453f-b689-a5c6c5f599f9.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "/review: rename setting `showInlineCodeSuggestionsWithCodeReferences` to `showCodeWithReferences`"
+}

packages/amazonq/package.json

@@ -122,7 +122,7 @@
                     },
                     "additionalProperties": false
                 },
-                "amazonQ.showInlineCodeSuggestionsWithCodeReferences": {
+                "amazonQ.showCodeWithReferences": {
                     "type": "boolean",
                     "markdownDescription": "%AWS.configuration.description.amazonq%",
                     "default": true

packages/core/src/codewhisperer/activation.ts

@@ -104,6 +104,9 @@ export async function activate(context: ExtContext): Promise<void> {
     localize = nls.loadMessageBundle()
     const codewhispererSettings = CodeWhispererSettings.instance
 
+    // Import old CodeWhisperer settings into Amazon Q
+    await CodeWhispererSettings.instance.importSettings()
+
     // initialize AuthUtil earlier to make sure it can listen to connection change events.
     const auth = AuthUtil.instance
     auth.initCodeWhispererHooks()
@@ -156,7 +159,7 @@ export async function activate(context: ExtContext): Promise<void> {
                 EditorContext.updateTabSize(getTabSizeSetting())
             }
 
-            if (configurationChangeEvent.affectsConfiguration('amazonQ.showInlineCodeSuggestionsWithCodeReferences')) {
+            if (configurationChangeEvent.affectsConfiguration('amazonQ.showCodeWithReferences')) {
                 ReferenceLogViewProvider.instance.update()
                 if (auth.isEnterpriseSsoInUse()) {
                     await vscode.window
@@ -212,7 +215,7 @@ export async function activate(context: ExtContext): Promise<void> {
             if (id === 'codewhisperer') {
                 await vscode.commands.executeCommand(
                     'workbench.action.openSettings',
-                    `@id:amazonQ.showInlineCodeSuggestionsWithCodeReferences`
+                    `@id:amazonQ.showCodeWithReferences`
                 )
             } else {
                 await openSettings('amazonQ')

packages/core/src/codewhisperer/util/codewhispererSettings.ts

@@ -2,11 +2,11 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { fromExtensionManifest } from '../../shared/settings'
 import { ArrayConstructor } from '../../shared/utilities/typeConstructors'
+import { fromExtensionManifest, migrateSetting } from '../../shared/settings'
 
 const description = {
-    showInlineCodeSuggestionsWithCodeReferences: Boolean, // eslint-disable-line id-length
+    showCodeWithReferences: Boolean,
     importRecommendationForInlineCodeSuggestions: Boolean, // eslint-disable-line id-length
     shareContentWithAWS: Boolean,
     workspaceIndex: Boolean,
@@ -18,8 +18,15 @@ const description = {
 }
 
 export class CodeWhispererSettings extends fromExtensionManifest('amazonQ', description) {
+    // TODO: Remove after a few releases
+    public async importSettings() {
+        await migrateSetting(
+            { key: 'amazonQ.showInlineCodeSuggestionsWithCodeReferences', type: Boolean },
+            { key: 'amazonQ.showCodeWithReferences' }
+        )
+    }
     public isSuggestionsWithCodeReferencesEnabled(): boolean {
-        return this.get(`showInlineCodeSuggestionsWithCodeReferences`, false)
+        return this.get(`showCodeWithReferences`, false)
     }
     public isImportRecommendationEnabled(): boolean {
         return this.get(`importRecommendationForInlineCodeSuggestions`, false)

packages/core/src/shared/settings-amazonq.gen.ts

@@ -20,7 +20,7 @@ export const amazonqSettings = {
         "minIdeVersion": {},
         "ssoCacheError": {}
     },
-    "amazonQ.showInlineCodeSuggestionsWithCodeReferences": {},
+    "amazonQ.showCodeWithReferences": {},
     "amazonQ.allowFeatureDevelopmentToRunCodeAndTests": {},
     "amazonQ.importRecommendationForInlineCodeSuggestions": {},
     "amazonQ.shareContentWithAWS": {},