Merge branch 'feature/q-lsp' into samgst/q-lsp-telemetry

Author: samgst-amazon

.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"
+}

.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"
+}

.changes/next-release/feature-c88b1af5-2318-4ca3-903c-a289e5494b1d.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Add support for 2025.1"
+}

buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt

@@ -100,10 +100,6 @@ object IdeVersions {
         ),
         Profile(
             name = "2024.2",
-            gateway = ProductProfile(
-                sdkVersion = "242.23726-EAP-CANDIDATE-SNAPSHOT",
-                bundledPlugins = listOf("org.jetbrains.plugins.terminal")
-            ),
             community = ProductProfile(
                 sdkVersion = "2024.2",
                 bundledPlugins = commonPlugins + listOf(

buildSrc/src/main/kotlin/toolkit-integration-testing.gradle.kts

@@ -79,6 +79,11 @@ extensions.findByType<IntelliJPlatformTestingExtension>()?.let {
         task {
             integrationTestConfiguration(this)
         }
+
+        // https://github.com/JetBrains/intellij-platform-gradle-plugin/issues/1844
+        prepareSandboxTask {
+            disabledPlugins.add("com.intellij.swagger")
+        }
     }
 } ?: run {
     val integrationTest by tasks.registering(Test::class, integrationTestConfiguration)

buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts

@@ -3,6 +3,7 @@
 
 import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
+import org.jetbrains.intellij.platform.gradle.tasks.PrepareSandboxTask
 import software.aws.toolkits.gradle.findFolders
 import software.aws.toolkits.gradle.intellij.IdeVersions
 import software.aws.toolkits.gradle.intellij.toolkitIntelliJ
@@ -103,7 +104,8 @@ dependencies {
     }
 }
 
-tasks.prepareTestSandbox {
+// https://github.com/JetBrains/intellij-platform-gradle-plugin/issues/1844
+tasks.withType<PrepareSandboxTask>().configureEach {
     disabledPlugins.addAll(
         "com.intellij.swagger",
         "org.jetbrains.plugins.kotlin.jupyter",

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt

@@ -83,7 +83,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(
@@ -103,7 +103,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(

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererConstants.kt

@@ -155,7 +155,7 @@ object CodeWhispererConstants {
 
     object Config {
         val CODEWHISPERER_ENDPOINT
-            get() = Registry.get("amazon.q.endpoint").asString()
+            get() = System.getenv("__CODEWHISPERER_ENDPOINT") ?: Registry.get("amazon.q.endpoint").asString()
 
         const val CODEWHISPERER_IDPOOL_ID = "us-east-1:70717e99-906f-4add-908c-bd9074a2f5b9"
         val Sigv4ClientRegion = Region.US_EAST_1

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

plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties

@@ -282,6 +282,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