Merge branch 'feature/q-lsp-chat' into q-lsp-chat

Author: andrewyuq

.changes/3.71.json

@@ -0,0 +1,11 @@
+{
+  "date" : "2025-05-15",
+  "version" : "3.71",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Add inline completion support for abap language"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix UI freezes that may occur when interacting with large files in the editor"
+  } ]
+}

.changes/next-release/bugfix-1d632e06-24fa-40f1-a8ae-33cca0d86ec4.json

@@ -1,3 +1,7 @@
+# _3.71_ (2025-05-15)
+- **(Feature)** Add inline completion support for abap language
+- **(Bug Fix)** Fix UI freezes that may occur when interacting with large files in the editor
+
 # _3.70_ (2025-05-08)
 - **(Feature)** Amazon Q: Support selecting customizations across all Q profiles with automatic profile switching for enterprise users
 - **(Bug Fix)** Do not always show 'Amazon Q Code Issues' tab when switching to the 'Problems' tool window

.changes/next-release/feature-eeb9909f-8f63-4bd7-8161-df8ca27dd953.json

@@ -35,7 +35,7 @@ val toolkitVersion: String by project
 
 // please check changelog generation logic if this format is changed
 // also sync with gateway version
-version = "$toolkitVersion-${ideProfile.shortName}"
+version = "$toolkitVersion.${ideProfile.shortName}"
 
 val resharperDlls = configurations.register("resharperDlls") {
     isCanBeConsumed = false

CHANGELOG.md

@@ -16,7 +16,7 @@ val ideProfile = IdeVersions.ideProfile(project)
 val toolkitVersion: String by project
 
 // please check changelog generation logic if this format is changed
-version = "$toolkitVersion-${ideProfile.shortName}"
+version = "$toolkitVersion.${ideProfile.shortName}"
 
 // attach the current commit hash on local builds
 if (!project.isCi()) {

buildSrc/src/main/kotlin/temp-toolkit-intellij-root-conventions.gradle.kts

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

buildSrc/src/main/kotlin/toolkit-publishing-conventions.gradle.kts

@@ -150,7 +150,7 @@ class Browser(parent: Disposable, private val webUri: URI, val project: Project)
                         agenticMode: true,
                         quickActionCommands: commands,
                         disclaimerAcknowledged: ${MeetQSettings.getInstance().disclaimerAcknowledged},
-                        pairProgrammingAcknowledged: ${!MeetQSettings.getInstance().amazonQChatPairProgramming}
+                        pairProgrammingAcknowledged: ${MeetQSettings.getInstance().pairProgrammingAcknowledged}
                         },
                         hybridChatConnector,
                         ${CodeWhispererFeatureConfigService.getInstance().getFeatureConfigJsonString()}                     

gradle.properties

@@ -27,6 +27,8 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import org.cef.browser.CefBrowser
 import org.eclipse.lsp4j.TextDocumentIdentifier
+import org.eclipse.lsp4j.jsonrpc.ResponseErrorException
+import org.eclipse.lsp4j.jsonrpc.messages.ResponseErrorCode
 import software.aws.toolkits.core.utils.error
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.warn
@@ -94,6 +96,7 @@ import software.aws.toolkits.jetbrains.settings.MeetQSettings
 import software.aws.toolkits.telemetry.MetricResult
 import software.aws.toolkits.telemetry.Telemetry
 import java.util.concurrent.CompletableFuture
+import java.util.concurrent.CompletionException
 import java.util.function.Function
 
 class BrowserConnector(
@@ -396,6 +399,12 @@ class BrowserConnector(
                                     )
                                 )
                             } catch (e: Exception) {
+                                val cause = if (e is CompletionException) e.cause else e
+
+                                // dont post error to UI if user cancels export
+                                if (cause is ResponseErrorException && cause.responseError.code == ResponseErrorCode.RequestCancelled.getValue()) {
+                                    return@whenComplete
+                                }
                                 LOG.error { "Failed to perform chat tab bar action $e" }
                                 params.tabId?.let {
                                     browser.postChat(chatCommunicationManager.getErrorUiMessage(it, e, null))
@@ -429,7 +438,7 @@ class BrowserConnector(
             CHAT_PROMPT_OPTION_ACKNOWLEDGED -> {
                 val acknowledgedMessage = node.params?.get("messageId")
                 if (acknowledgedMessage?.asText() == "programmerModeCardId") {
-                    MeetQSettings.getInstance().amazonQChatPairProgramming = false
+                    MeetQSettings.getInstance().pairProgrammingAcknowledged = true
                 }
             }
 

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

@@ -18,6 +18,7 @@ enum class CssVariable(
     TextColorWeak("--mynah-color-text-weak"),
     TextColorLink("--mynah-color-text-link"),
     TextColorInput("--mynah-color-text-input"),
+    TextColorDisabled("--mynah-color-text-disabled"),
 
     Background("--mynah-color-bg"),
     BackgroundAlt("--mynah-color-bg-alt"),