Merge branch 'main' into feature/stop-generation

Author: tverney

.changes/3.32.json

@@ -0,0 +1,32 @@
+{
+  "date" : "2024-10-10",
+  "version" : "3.32",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Loosen inline completion support limitations for YAML/JSON"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix error occuring when Amazon Q attempts to show UI hints on manually triggerred inline suggestion (#4929)"
+  }, {
+    "type" : "bugfix",
+    "description" : "Amazon Q (/dev): provide error messaging when no code changes are required for the prompt"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix 'Slow operations are prohibited on EDT.' when Amazon Q is determining if a file supports inline suggestions (#4823)"
+  }, {
+    "type" : "bugfix",
+    "description" : "Amazon Q Feature Dev: Add error messages when the upload URL expires"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix toolkit connection dropdown getting hidden when panel width is small."
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix inability to sign out in reauth view in Q chat panel"
+  }, {
+    "type" : "bugfix",
+    "description" : "Raise max `@workspace` indexing size to 4GB"
+  }, {
+    "type" : "bugfix",
+    "description" : "Automatically pause and resume `@workspace` indexing when OS CPU load is high"
+  } ]
+}

.changes/next-release/bugfix-c7239939-2067-469a-809e-594d2c95594b.json

@@ -1,3 +1,14 @@
+# _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))
+- **(Bug Fix)** Amazon Q (/dev): provide error messaging when no code changes are required for the prompt
+- **(Bug Fix)** Fix 'Slow operations are prohibited on EDT.' when Amazon Q is determining if a file supports inline suggestions ([#4823](https://github.com/aws/aws-toolkit-jetbrains/issues/4823))
+- **(Bug Fix)** Amazon Q Feature Dev: Add error messages when the upload URL expires
+- **(Bug Fix)** Fix toolkit connection dropdown getting hidden when panel width is small.
+- **(Bug Fix)** Fix inability to sign out in reauth view in Q chat panel
+- **(Bug Fix)** Raise max `@workspace` indexing size to 4GB
+- **(Bug Fix)** Automatically pause and resume `@workspace` indexing when OS CPU load is high
+
 # _3.31_ (2024-10-03)
 - **(Feature)** Amazon Q Developer: Updated legal disclaimer text
 - **(Feature)** Amazon Q Code Transformation: allow users to skip tests

CHANGELOG.md

@@ -7,8 +7,16 @@ import org.gradle.api.Project
 import org.gradle.api.provider.Provider
 import org.gradle.api.provider.ProviderFactory
 
-
-enum class IdeFlavor { GW, IC, IU, RD }
+/** The subset of [org.jetbrains.intellij.platform.gradle.IntelliJPlatformType] that are relevant to us **/
+enum class IdeFlavor {
+    GW,
+    /* free */
+    AI, IC, PC,
+    /* paid */
+    /* RR is 'non-commerical free' but treat as paid */
+    DB, CL, GO, IU, PS, PY, RM, RR, WS,
+    RD,
+}
 
 object IdeVersions {
     private val commonPlugins = listOf(
@@ -21,7 +29,6 @@ object IdeVersions {
         Profile(
             name = "2023.3",
             community = ProductProfile(
-                sdkFlavor = IdeFlavor.IC,
                 sdkVersion = "2023.3",
                 bundledPlugins = commonPlugins + listOf(
                     "com.intellij.java",
@@ -34,7 +41,6 @@ object IdeVersions {
                 )
             ),
             ultimate = ProductProfile(
-                sdkFlavor = IdeFlavor.IU,
                 sdkVersion = "2023.3",
                 bundledPlugins = commonPlugins + listOf(
                     "JavaScript",
@@ -58,7 +64,6 @@ object IdeVersions {
         Profile(
             name = "2024.1",
             community = ProductProfile(
-                sdkFlavor = IdeFlavor.IC,
                 sdkVersion = "2024.1",
                 bundledPlugins = commonPlugins + listOf(
                     "com.intellij.java",
@@ -72,7 +77,6 @@ object IdeVersions {
                 )
             ),
             ultimate = ProductProfile(
-                sdkFlavor = IdeFlavor.IU,
                 sdkVersion = "2024.1",
                 bundledPlugins = commonPlugins + listOf(
                     "JavaScript",
@@ -97,12 +101,10 @@ object IdeVersions {
         Profile(
             name = "2024.2",
             gateway = ProductProfile(
-                sdkFlavor = IdeFlavor.GW,
                 sdkVersion = "242.20224-EAP-CANDIDATE-SNAPSHOT",
                 bundledPlugins = listOf("org.jetbrains.plugins.terminal")
             ),
             community = ProductProfile(
-                sdkFlavor = IdeFlavor.IC,
                 sdkVersion = "2024.2",
                 bundledPlugins = commonPlugins + listOf(
                     "com.intellij.java",
@@ -116,7 +118,6 @@ object IdeVersions {
                 )
             ),
             ultimate = ProductProfile(
-                sdkFlavor = IdeFlavor.IU,
                 sdkVersion = "2024.2",
                 bundledPlugins = commonPlugins + listOf(
                     "JavaScript",
@@ -151,7 +152,6 @@ object IdeVersions {
 }
 
 open class ProductProfile(
-    val sdkFlavor: IdeFlavor,
     val sdkVersion: String,
     val bundledPlugins: List<String> = emptyList(),
     val marketplacePlugins: List<String> = emptyList()
@@ -164,7 +164,7 @@ class RiderProfile(
     val nugetVersion: String, // https://www.nuget.org/packages/JetBrains.Rider.SDK/
     bundledPlugins: List<String> = emptyList(),
     marketplacePlugins: List<String> = emptyList(),
-) : ProductProfile(IdeFlavor.RD, sdkVersion, bundledPlugins, marketplacePlugins)
+) : ProductProfile(sdkVersion, bundledPlugins, marketplacePlugins)
 
 class Profile(
     val name: String,

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

@@ -20,8 +20,22 @@ abstract class ToolkitIntelliJExtension(private val providers: ProviderFactory)
 
     fun productProfile(): Provider<out ProductProfile> = ideFlavor.flatMap { flavor ->
         when (flavor) {
-            IdeFlavor.IC -> ideProfile().map { it.community }
-            IdeFlavor.IU -> ideProfile().map { it.ultimate }
+            IdeFlavor.AI,
+            IdeFlavor.IC,
+            IdeFlavor.PC,
+                -> ideProfile().map { it.community }
+
+            IdeFlavor.DB,
+            IdeFlavor.CL,
+            IdeFlavor.GO,
+            IdeFlavor.IU,
+            IdeFlavor.PS,
+            IdeFlavor.PY,
+            IdeFlavor.RM,
+            IdeFlavor.RR,
+            IdeFlavor.WS,
+                -> ideProfile().map { it.ultimate }
+
             IdeFlavor.RD -> ideProfile().map { it.rider }
             IdeFlavor.GW -> ideProfile().map { it.gateway!! }
         }

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

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

gradle.properties

@@ -6,6 +6,7 @@ package software.aws.toolkits.jetbrains.services.amazonq
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.application.runInEdt
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
@@ -19,6 +20,7 @@ import com.intellij.ui.jcef.JBCefJSQuery
 import org.cef.CefApp
 import software.aws.toolkits.core.utils.error
 import software.aws.toolkits.core.utils.getLogger
+import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.core.credentials.AwsBearerTokenConnection
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitAuthManager
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
@@ -177,13 +179,15 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
                     ToolkitConnectionManager.getInstance(project)
                         .activeConnectionForFeature(QConnection.getInstance()) as? AwsBearerTokenConnection
                     )?.let { connection ->
-                    SsoLogoutAction(connection).actionPerformed(
-                        AnActionEvent.createFromDataContext(
-                            "qBrowser",
-                            null,
-                            DataContext.EMPTY_CONTEXT
+                    runInEdt {
+                        SsoLogoutAction(connection).actionPerformed(
+                            AnActionEvent.createFromDataContext(
+                                "qBrowser",
+                                null,
+                                DataContext.EMPTY_CONTEXT
+                            )
                         )
-                    )
+                    }
                 }
             }
 
@@ -198,7 +202,7 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
             is BrowserMessage.SendUiClickTelemetry -> {
                 val signInOption = message.signInOptionClicked
                 if (signInOption.isNullOrEmpty()) {
-                    LOG.warn("Unknown sign in option")
+                    LOG.warn { "Unknown sign in option" }
                 } else {
                     UiTelemetry.click(project, signInOption)
                 }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt

@@ -88,7 +88,7 @@ class AuthController {
             AuthFollowUpType.FullAuth,
             -> runInEdt {
                 UiTelemetry.click(project, "amazonq_chatAuthenticate")
-                requestCredentialsForQ(project, connectionInitiatedFromQChatPanel = true)
+                requestCredentialsForQ(project, connectionInitiatedFromQChatPanel = true, isReauth = false)
             }
 
             AuthFollowUpType.ReAuth,

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/auth/AuthController.kt

@@ -24,7 +24,7 @@ class SignInToQAction : SignInToQActionBase(message("q.sign.in")) {
         UiTelemetry.click(project, "auth_start_Q")
 
         if (!isQWebviewsAvailable()) {
-            requestCredentialsForQ(project)
+            requestCredentialsForQ(project, isReauth = false)
         } else {
             ToolWindowManager.getInstance(project).getToolWindow(AmazonQToolWindowFactory.WINDOW_ID)?.show()
         }
@@ -42,7 +42,7 @@ abstract class SignInToQActionBase(actionName: String) : DumbAwareAction(actionN
             reauthConnectionIfNeeded(project, it, isReAuth = true)
         } ?: run {
             runInEdt {
-                if (requestCredentialsForQ(project)) {
+                if (requestCredentialsForQ(project, isReauth = false)) {
                     if (!openMeetQPage(project)) {
                         return@runInEdt
                     }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/explorerActions/SignInToQAction.kt

@@ -25,3 +25,16 @@ enum class ModifySourceFolderErrorReason(
 
     override fun toString(): String = reasonText
 }
+
+enum class FeatureDevOperation(private val operationName: String) {
+    StartTaskAssistCodeGeneration("StartTaskAssistCodeGenerator"),
+    CreateConversation("CreateConversation"),
+    CreateUploadUrl("CreateUploadUrl"),
+    GenerateCode("GenerateCode"),
+    GetTaskAssistCodeGeneration("GetTaskAssistCodeGenerator"),
+    ExportTaskAssistArchiveResult("ExportTaskAssistArchiveResult"),
+    UploadToS3("UploadToS3"),
+    ;
+
+    override fun toString(): String = operationName
+}