adding migrateSetting to keep old settings without resetting

Author: atonaamz

packages/core/package.json

@@ -473,7 +473,7 @@
         "c8": "^9.0.0",
         "circular-dependency-plugin": "^5.2.2",
         "css-loader": "^6.10.0",
-        "esbuild-loader": "2.20.0",
+        "esbuild-loader": "^4.3.0",
         "file-loader": "^6.2.0",
         "jsdom": "^23.0.1",
         "json-schema-to-typescript": "^13.1.1",
@@ -496,29 +496,29 @@
     "dependencies": {
         "@amzn/amazon-q-developer-streaming-client": "file:../../src.gen/@amzn/amazon-q-developer-streaming-client",
         "@amzn/codewhisperer-streaming": "file:../../src.gen/@amzn/codewhisperer-streaming",
+        "@aws-sdk/client-api-gateway": "<3.696.0",
         "@aws-sdk/client-cloudformation": "<3.696.0",
         "@aws-sdk/client-cloudwatch-logs": "<3.696.0",
+        "@aws-sdk/client-codecatalyst": "<3.696.0",
         "@aws-sdk/client-cognito-identity": "<3.696.0",
         "@aws-sdk/client-docdb": "<3.696.0",
         "@aws-sdk/client-docdb-elastic": "<3.696.0",
         "@aws-sdk/client-ec2": "<3.696.0",
         "@aws-sdk/client-iam": "<3.696.0",
-        "@aws-sdk/client-s3": "<3.696.0",
-        "@aws-sdk/client-api-gateway": "<3.696.0",
-        "@aws-sdk/lib-storage": "<3.696.0",
         "@aws-sdk/client-lambda": "<3.696.0",
+        "@aws-sdk/client-s3": "<3.696.0",
         "@aws-sdk/client-ssm": "<3.696.0",
         "@aws-sdk/client-sso": "<3.696.0",
         "@aws-sdk/client-sso-oidc": "<3.696.0",
         "@aws-sdk/credential-provider-env": "<3.696.0",
         "@aws-sdk/credential-provider-process": "<3.696.0",
         "@aws-sdk/credential-provider-sso": "<3.696.0",
+        "@aws-sdk/lib-storage": "<3.696.0",
         "@aws-sdk/property-provider": "<3.696.0",
         "@aws-sdk/protocol-http": "<3.696.0",
+        "@aws-sdk/s3-request-presigner": "<3.696.0",
         "@aws-sdk/smithy-client": "<3.696.0",
         "@aws-sdk/util-arn-parser": "<3.696.0",
-        "@aws-sdk/client-codecatalyst": "<3.696.0",
-        "@aws-sdk/s3-request-presigner": "<3.696.0",
         "@aws/mynah-ui": "^4.23.1",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
         "@iarna/toml": "^2.2.5",

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()

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

@@ -2,8 +2,8 @@
  * 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 = {
     showCodeWithReferences: Boolean, // eslint-disable-line id-length
@@ -18,6 +18,13 @@ 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(`showCodeWithReferences`, false)
     }