Merge master into feature/logs

aws-toolkit-automation · web-flow · commit a246988ecd5c · 2025-05-13T13:31:08.000-04:00
diff --git a/packages/amazonq/src/lsp/client.ts b/packages/amazonq/src/lsp/client.ts
@@ -338,6 +338,8 @@ function getConfigSection(section: ConfigSection) {
                     includeSuggestionsWithCodeReferences:
                         CodeWhispererSettings.instance.isSuggestionsWithCodeReferencesEnabled(),
                     shareCodeWhispererContentWithAWS: !CodeWhispererSettings.instance.isOptoutEnabled(),
+                    includeImportsWithSuggestions: CodeWhispererSettings.instance.isImportRecommendationEnabled(),
+                    sendUserWrittenCodeMetrics: true,
                 },
             ]
         case 'aws.logLevel':

Original file line number	Diff line number	Diff line change
`@@ -338,6 +338,8 @@ function getConfigSection(section: ConfigSection) {`
`338`	`338`	`includeSuggestionsWithCodeReferences:`
`339`	`339`	`CodeWhispererSettings.instance.isSuggestionsWithCodeReferencesEnabled(),`
`340`	`340`	`shareCodeWhispererContentWithAWS: !CodeWhispererSettings.instance.isOptoutEnabled(),`
	`341`	`+ includeImportsWithSuggestions: CodeWhispererSettings.instance.isImportRecommendationEnabled(),`
	`342`	`+ sendUserWrittenCodeMetrics: true,`
`341`	`343`	`},`
`342`	`344`	`]`
`343`	`345`	`case 'aws.logLevel':`