Merge remote-tracking branch 'upstream/main' into lsp-client

Author: Will-ShaoHua

.changes/3.33.json

@@ -0,0 +1,14 @@
+{
+  "date" : "2024-10-17",
+  "version" : "3.33",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Add support for 2024.3"
+  }, {
+    "type" : "bugfix",
+    "description" : "`@workspace` cannot properly locate certain folders for certain project setup"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix an IDE deadlock that may occur while attempting to initialize Amazon Q UI elements (#4966)"
+  } ]
+}

.changes/next-release/bugfix-bcf4a2c9-230b-440b-93ed-8b2fb96929be.json

@@ -1,3 +1,8 @@
+# _3.33_ (2024-10-17)
+- **(Feature)** Add support for 2024.3
+- **(Bug Fix)** `@workspace` cannot properly locate certain folders for certain project setup
+- **(Bug Fix)** Fix an IDE deadlock that may occur while attempting to initialize Amazon Q UI elements ([#4966](https://github.com/aws/aws-toolkit-jetbrains/issues/4966))
+
 # _3.32_ (2024-10-10)
 - **(Feature)** Loosen inline completion support limitations for YAML/JSON
 - **(Bug Fix)** Fix error occuring when Amazon Q attempts to show UI hints on manually triggerred inline suggestion ([#4929](https://github.com/aws/aws-toolkit-jetbrains/issues/4929))

.changes/next-release/feature-dd281d60-2902-47d0-b7d6-bf0bd6225abd.json

@@ -101,7 +101,7 @@ object IdeVersions {
         Profile(
             name = "2024.2",
             gateway = ProductProfile(
-                sdkVersion = "242.20224-EAP-CANDIDATE-SNAPSHOT",
+                sdkVersion = "242.23726-EAP-CANDIDATE-SNAPSHOT",
                 bundledPlugins = listOf("org.jetbrains.plugins.terminal")
             ),
             community = ProductProfile(
@@ -132,11 +132,11 @@ object IdeVersions {
                 )
             ),
             rider = RiderProfile(
-                sdkVersion = "2024.2-EAP7-SNAPSHOT",
+                sdkVersion = "2024.2",
                 bundledPlugins = commonPlugins,
                 netFrameworkTarget = "net472",
                 rdGenVersion = "2024.1.1",
-                nugetVersion = " 2024.2.0-eap07"
+                nugetVersion = " 2024.2.0"
             )
         ),
         Profile(

CHANGELOG.md

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.33-SNAPSHOT
+toolkitVersion=3.34-SNAPSHOT
 
 # Publish Settings
 publishToken=

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

@@ -19,7 +19,6 @@ dependencies {
     implementation(project(":plugin-amazonq:shared:jetbrains-community"))
     // everything references codewhisperer, which is not ideal
     implementation(project(":plugin-amazonq:codewhisperer:jetbrains-community"))
-    implementation(libs.nimbus.jose.jwt)
 
     compileOnly(project(":plugin-core:jetbrains-community"))
 

gradle.properties

@@ -8,7 +8,7 @@
     <projectListeners>
         <listener class="software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AmazonQToolWindowListener"
                   topic="com.intellij.openapi.wm.ex.ToolWindowManagerListener"/>
-        <listener class="software.aws.toolkits.jetbrains.services.cwc.editor.context.project.ProjectContextEditorListener"
+        <listener class="software.aws.toolkits.jetbrains.services.amazonq.project.ProjectContextEditorListener"
                   topic="com.intellij.openapi.fileEditor.FileEditorManagerListener"/>
     </projectListeners>
 

plugins/amazonq/chat/jetbrains-community/build.gradle.kts

@@ -15,11 +15,11 @@ import kotlinx.coroutines.time.withTimeout
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.core.gettingstarted.emitUserState
+import software.aws.toolkits.jetbrains.services.amazonq.project.ProjectContextController
 import software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AmazonQToolWindow
 import software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AmazonQToolWindowFactory
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager
-import software.aws.toolkits.jetbrains.services.codewhisperer.settings.CodeWhispererSettings
-import software.aws.toolkits.jetbrains.services.cwc.editor.context.project.ProjectContextController
+import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
 import java.lang.management.ManagementFactory
 import java.time.Duration
 import java.util.concurrent.atomic.AtomicBoolean

plugins/amazonq/chat/jetbrains-community/resources/META-INF/plugin-chat.xml

@@ -5,9 +5,9 @@ package software.aws.toolkits.jetbrains.services.cwc.clients.chat.model
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import software.amazon.awssdk.services.codewhispererstreaming.model.UserIntent
+import software.aws.toolkits.jetbrains.services.amazonq.project.RelevantDocument
 import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererCustomization
 import software.aws.toolkits.jetbrains.services.cwc.editor.context.ActiveFileContext
-import software.aws.toolkits.jetbrains.services.cwc.editor.context.project.RelevantDocument
 
 enum class TriggerType {
     Click,