Merge branch 'main' into kevin/telemetry

KevinDing1 · web-flow · commit 87a8c02e4d67 · 2025-03-26T10:58:49.000-04:00
diff --git a/.changes/next-release/deprecation-90102050-86a4-4c19-9ecc-70c6e033b949.json b/.changes/next-release/deprecation-90102050-86a4-4c19-9ecc-70c6e033b949.json
@@ -0,0 +1,4 @@
+{
+  "type" : "deprecation",
+  "description" : "An upcoming release will remove support for JetBrains Gateway version 2024.3 and for IDEs based on the 2024.1 platform"
+}
diff --git a/.changes/next-release/feature-45f6e6a7-fc5b-4b14-89e2-0d9a2b138c65.json b/.changes/next-release/feature-45f6e6a7-fc5b-4b14-89e2-0d9a2b138c65.json
@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Amazon Q: Moved \"Include suggestions with code references\" setting to General"
+}
diff --git a/.changes/next-release/feature-c88b1af5-2318-4ca3-903c-a289e5494b1d.json b/.changes/next-release/feature-c88b1af5-2318-4ca3-903c-a289e5494b1d.json
@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Add support for 2025.1"
+}
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt
@@ -61,7 +61,7 @@ class CodeWhispererConfigurable(private val project: Project) :
             }
         }
 
-        group(message("aws.settings.codewhisperer.group.inline_suggestions")) {
+        group(message("aws.settings.codewhisperer.group.general")) {
             row {
                 checkBox(message("aws.settings.codewhisperer.include_code_with_reference")).apply {
                     connect.subscribe(
@@ -81,7 +81,9 @@ class CodeWhispererConfigurable(private val project: Project) :
                     }.enabled(false)
                 }
             }
+        }
 
+        group(message("aws.settings.codewhisperer.group.inline_suggestions")) {
             row {
                 checkBox(message("aws.settings.codewhisperer.automatic_import_adder")).apply {
                     connect.subscribe(
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererProjectCodeScanTest.kt b/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererProjectCodeScanTest.kt
@@ -112,12 +112,14 @@ class CodeWhispererProjectCodeScanTest : CodeWhispererCodeScanTestBase(PythonCod
 
     @Test
     fun `test getNormalizedRelativePath()`() {
-        assertThat(
-            listOf("projectName\\src\\PackageName", "projectName/src/PackageName")
-        ).contains(getNormalizedRelativePath("projectName", Paths.get("src/PackageName")))
-        assertThat(
-            listOf("projectName\\src\\Package2", "projectName/src/Package2")
-        ).contains(getNormalizedRelativePath("projectName", Paths.get("src/./Package1/../Package2")))
+        assertThat(getNormalizedRelativePath("projectName", Paths.get("src/PackageName"))).satisfiesAnyOf(
+            { assertThat(it).isEqualTo("projectName\\src\\PackageName") },
+            { assertThat(it).isEqualTo("projectName/src/PackageName") },
+        )
+        assertThat(getNormalizedRelativePath("projectName", Paths.get("src/./Package1/../Package2"))).satisfiesAnyOf(
+            { assertThat(it).isEqualTo("projectName\\src\\Package2") },
+            { assertThat(it).isEqualTo("projectName/src/Package2") },
+        )
     }
 
     private fun setupCsharpProject() {
diff --git a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
@@ -279,6 +279,7 @@ aws.settings.codewhisperer.configurable.title=Amazon Q
 aws.settings.codewhisperer.feature_development=Feature Development
 aws.settings.codewhisperer.feature_development.allow_running_code_and_test_commands=Allow /dev to run code and test commands
 aws.settings.codewhisperer.group.data_sharing=Data Sharing
+aws.settings.codewhisperer.group.general=General
 aws.settings.codewhisperer.group.inline_suggestions=Inline Suggestions
 aws.settings.codewhisperer.group.plugin_settings=Plugin Settings
 aws.settings.codewhisperer.group.q_chat=Chat
diff --git a/plugins/core/sdk-codegen/codegen-resources/codewhispererruntime/service-2.json b/plugins/core/sdk-codegen/codegen-resources/codewhispererruntime/service-2.json
diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/notification/MinimumVersionChange.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/notification/MinimumVersionChange.kt
diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/GatewayDeprecationNotice.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/GatewayDeprecationNotice.kt

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "deprecation",
 +  "description" : "An upcoming release will remove support for JetBrains Gateway version 2024.3 and for IDEs based on the 2024.1 platform"
 +}
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ class CodeWhispererConfigurable(private val project: Project) :`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`64`		`- group(message("aws.settings.codewhisperer.group.inline_suggestions")) {`
	`64`	`+ group(message("aws.settings.codewhisperer.group.general")) {`
`65`	`65`	`row {`
`66`	`66`	`checkBox(message("aws.settings.codewhisperer.include_code_with_reference")).apply {`
`67`	`67`	`connect.subscribe(`
`@@ -81,7 +81,9 @@ class CodeWhispererConfigurable(private val project: Project) :`
`81`	`81`	`}.enabled(false)`
`82`	`82`	`}`
`83`	`83`	`}`
	`84`	`+ }`
`84`	`85`
	`86`	`+ group(message("aws.settings.codewhisperer.group.inline_suggestions")) {`
`85`	`87`	`row {`
`86`	`88`	`checkBox(message("aws.settings.codewhisperer.automatic_import_adder")).apply {`
`87`	`89`	`connect.subscribe(`