Merge master into feature/LSP-gamma

aws-toolkit-automation · web-flow · commit 9b37da8b06e8 · 2025-05-13T13:23:34.000-04:00
diff --git a/packages/amazonq/src/lsp/client.ts b/packages/amazonq/src/lsp/client.ts
@@ -333,6 +333,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
`@@ -333,6 +333,8 @@ function getConfigSection(section: ConfigSection) {`
`333`	`333`	`includeSuggestionsWithCodeReferences:`
`334`	`334`	`CodeWhispererSettings.instance.isSuggestionsWithCodeReferencesEnabled(),`
`335`	`335`	`shareCodeWhispererContentWithAWS: !CodeWhispererSettings.instance.isOptoutEnabled(),`
	`336`	`+ includeImportsWithSuggestions: CodeWhispererSettings.instance.isImportRecommendationEnabled(),`
	`337`	`+ sendUserWrittenCodeMetrics: true,`
`336`	`338`	`},`
`337`	`339`	`]`
`338`	`340`	`case 'aws.logLevel':`